diff options
| author | Werner Koch <[email protected]> | 2017-08-04 20:19:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-08-04 20:19:37 +0000 |
| commit | 9bb13a0e819334681caca38c9074bd7bfc04e45e (patch) | |
| tree | 2faf24c4739cc94a3f90c3ec5b3f8a0a512efefc | |
| parent | gpg: Default to --auto-key-locate "local,wkd" and --auto-key-retrieve. (diff) | |
| download | gnupg-9bb13a0e819334681caca38c9074bd7bfc04e45e.tar.gz gnupg-9bb13a0e819334681caca38c9074bd7bfc04e45e.zip | |
gpg: Make --no-auto-key-retrieve gpgconf-igurable.
* g10/gpg.c (gpgconf_list): Print no-auto-key-retrieve instead of
auto-key-retrieve.
* tools/gpgconf-comp.c (gc_options_gpg): Replace auto-key-retrieve by
no-auto-key-retrieve and chnage level from invisible to advanced.
Signed-off-by: Werner Koch <[email protected]>
| -rw-r--r-- | g10/gpg.c | 2 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -1850,7 +1850,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 ("auto-key-retrieve:%lu:\n", GC_OPT_FLAG_NONE); + es_printf ("no-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); diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 527815ccb..e78633ffd 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -755,7 +755,7 @@ 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, + { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, |