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 /tools/gpgconf-comp.c | |
| 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]>
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"), |