diff options
| author | Werner Koch <[email protected]> | 2017-08-23 14:45:20 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-08-23 14:45:20 +0000 |
| commit | 565e486b8028f9e3cc51ebc5202666b598042175 (patch) | |
| tree | 0713d5e7fea0ad2eb7647920f833acda5db4d098 | |
| parent | tests: Do not run trust-pgp-4.scm (diff) | |
| download | gnupg-565e486b8028f9e3cc51ebc5202666b598042175.tar.gz gnupg-565e486b8028f9e3cc51ebc5202666b598042175.zip | |
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 <[email protected]>
| -rw-r--r-- | g10/gpg.c | 13 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
2 files changed, 9 insertions, 8 deletions
@@ -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 e9d4ca804..e6ef4f4e3 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"), |