[git] GnuPG - branch, master, updated. gnupg-2.2-base-14-g565e486

[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  565e486b8028f9e3cc51ebc5202666b598042175 (commit)
      from  b917cb66b79597520788cd9264889942247a3377 (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 565e486b8028f9e3cc51ebc5202666b598042175
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 23 16:45:20 2017 +0200

    gpgconf: Swap "auto-key-retrieve" and "no-auto-key-retrieve".
    
    * g10/gpg.c (gpgconf_list): Announce "auto-key-retrieve".
    (main): Simplify setting of KEYSERVER_AUTO_KEY_RETRIEVE.
    * tools/gpgconf-comp.c: Make "no-auto-key-retrieve" invisible.  Make
    "auto-key-retrieve" an expert option.
    --
    
    This basically reverts 9bb13a0e819334681caca38c9074bd7bfc04e45e
    because --no-auto-key-retrieve is again the default.  Note that we
    allow both options for the sake of profiles.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index 31b1fca..62d6131 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1852,7 +1852,7 @@ gpgconf_list (const char *configfile)
   es_printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("try-secret-key:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("auto-key-locate:%lu:\n", GC_OPT_FLAG_NONE);
-  es_printf ("no-auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
+  es_printf ("auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
   es_printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
   es_printf ("group:%lu:\n", GC_OPT_FLAG_NONE);
@@ -3336,13 +3336,14 @@ main (int argc, char **argv)
 	  case oIgnoreCrcError: opt.ignore_crc_error = 1; break;
 	  case oIgnoreMDCError: opt.ignore_mdc_error = 1; break;
 	  case oNoRandomSeedFile: use_random_seed = 0; break;
+
 	  case oAutoKeyRetrieve:
+            opt.keyserver_options.options |= KEYSERVER_AUTO_KEY_RETRIEVE;
+            break;
 	  case oNoAutoKeyRetrieve:
-	        if(pargs.r_opt==oAutoKeyRetrieve)
-		  opt.keyserver_options.options|=KEYSERVER_AUTO_KEY_RETRIEVE;
-		else
-		  opt.keyserver_options.options&=~KEYSERVER_AUTO_KEY_RETRIEVE;
-		break;
+            opt.keyserver_options.options &= ~KEYSERVER_AUTO_KEY_RETRIEVE;
+            break;
+
 	  case oShowSessionKey: opt.show_session_key = 1; break;
 	  case oOverrideSessionKey:
 		opt.override_session_key = pargs.r.ret_str;
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index e9d4ca8..e6ef4f4 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -755,9 +755,9 @@ static gc_option_t gc_options_gpg[] =
    { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
      "gnupg", N_("|MECHANISMS|use MECHANISMS to locate keys by mail address"),
      GC_ARG_TYPE_STRING, GC_BACKEND_GPG },
-   { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
+   { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
-   { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
+   { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE,
      NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG },
    { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT,
      "gnupg", N_("disable all access to the dirmngr"),

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

Summary of changes:
 g10/gpg.c            | 13 +++++++------
 tools/gpgconf-comp.c |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)


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