[git] GnuPG - branch, master, updated. gnupg-2.1.5-11-g010d26a

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  010d26a85bfe15c4aa12eefeab851dbde0609c26 (commit)
      from  685b782a18adb90bbf78956682e4e7f89fed678c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 010d26a85bfe15c4aa12eefeab851dbde0609c26
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 17 12:59:29 2015 +0200

    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 <wk at gnupg.org>

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index e721d8a..8c71e0d 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;
 	}
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index a0dae8f..8e71071 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 *
diff --git a/common/util.h b/common/util.h
index 0e585df..82e9887 100644
--- a/common/util.h
+++ b/common/util.h
@@ -370,6 +370,9 @@ char *xtryasprintf (const char *fmt, ...) GPGRT_GCC_A_PRINTF(1,2);
 /* Replacement for gcry_cipher_algo_name.  */
 const char *gnupg_cipher_algo_name (int algo);
 
+void obsolete_option (const char *configname, unsigned int configlineno,
+                      const char *name);
+
 const char *print_fname_stdout (const char *s);
 const char *print_fname_stdin (const char *s);
 void print_utf8_buffer3 (estream_t fp, const void *p, size_t n,
diff --git a/g10/main.h b/g10/main.h
index 9370ae5..f4bf17f 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -134,8 +134,6 @@ char *pct_expando(const char *string,struct expando_args *args);
 void deprecated_warning(const char *configname,unsigned int configlineno,
 			const char *option,const char *repl1,const char *repl2);
 void deprecated_command (const char *name);
-void obsolete_option (const char *configname, unsigned int configlineno,
-                      const char *name);
 void obsolete_scdaemon_option (const char *configname,
                                unsigned int configlineno, const char *name);
 
diff --git a/g10/misc.c b/g10/misc.c
index 654908d..9134b28 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1013,19 +1013,6 @@ deprecated_command (const char *name)
 
 
 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);
-}
-
-
-void
 obsolete_scdaemon_option (const char *configname, unsigned int configlineno,
                           const char *name)
 {

-----------------------------------------------------------------------

Summary of changes:
 agent/gpg-agent.c      | 10 +++++++---
 common/miscellaneous.c | 14 ++++++++++++++
 common/util.h          |  3 +++
 g10/main.h             |  2 --
 g10/misc.c             | 13 -------------
 5 files changed, 24 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org