From 010d26a85bfe15c4aa12eefeab851dbde0609c26 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 17 Jun 2015 12:59:29 +0200 Subject: 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 --- common/miscellaneous.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'common/miscellaneous.c') diff --git a/common/miscellaneous.c b/common/miscellaneous.c index a0dae8fb1..8e71071f0 100644 --- a/common/miscellaneous.c +++ b/common/miscellaneous.c @@ -104,6 +104,7 @@ setup_libgcrypt_logging (void) gcry_set_outofcore_handler (my_gcry_outofcore_handler, NULL); } + /* A wrapper around gcry_cipher_algo_name to return the string "AES-128" instead of "AES". Given that we have an alias in libgcrypt for it, it does not harm to too much to return this other @@ -122,6 +123,19 @@ gnupg_cipher_algo_name (int algo) } +void +obsolete_option (const char *configname, unsigned int configlineno, + const char *name) +{ + if (configname) + log_info (_("%s:%u: obsolete option \"%s\" - it has no effect\n"), + configname, configlineno, name); + else + log_info (_("WARNING: \"%s%s\" is an obsolete option - it has no effect\n"), + "--", name); +} + + /* Decide whether the filename is stdout or a real filename and return * an appropriate string. */ const char * -- cgit v1.2.3