aboutsummaryrefslogtreecommitdiffstats
path: root/agent/gpg-agent.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-06-17 10:59:29 +0000
committerWerner Koch <[email protected]>2015-06-17 10:59:29 +0000
commit010d26a85bfe15c4aa12eefeab851dbde0609c26 (patch)
tree539f5f9a035ccb83861fe63a0390c0d317573b0d /agent/gpg-agent.c
parentdirmngr: Cleanup zombies and fix hang on shutdown. (diff)
downloadgnupg-010d26a85bfe15c4aa12eefeab851dbde0609c26.tar.gz
gnupg-010d26a85bfe15c4aa12eefeab851dbde0609c26.zip
agent: Print a warning for obsolete options.
* g10/misc.c (obsolete_scdaemon_option): Move to * common/miscellaneous.c (obsolete_option): ... here. * agent/gpg-agent.c (main): Use obsolete_option for the 3 obsolete options. -- GnuPG-bug-id: 2016 Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'agent/gpg-agent.c')
-rw-r--r--agent/gpg-agent.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index e721d8a00..8c71e0d41 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -908,8 +908,10 @@ main (int argc, char **argv )
case oXauthority: default_xauthority = xstrdup (pargs.r.ret_str);
break;
- case oUseStandardSocket: /* dummy */ break;
- case oNoUseStandardSocket: /* dummy */ break;
+ case oUseStandardSocket:
+ case oNoUseStandardSocket:
+ obsolete_option (configname, configlineno, "use-standard-socket");
+ break;
case oFakedSystemTime:
{
@@ -945,7 +947,9 @@ main (int argc, char **argv )
/* Only used by the first stage command line parser. */
break;
- case oWriteEnvFile: /* dummy */ break;
+ case oWriteEnvFile:
+ obsolete_option (configname, configlineno, "write-env-file");
+ break;
default : pargs.err = configfp? 1:2; break;
}