diff options
| author | Justus Winter <justus@g10code.com> | 2017-02-28 14:59:11 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-02-28 14:59:11 +0100 |
| commit | d379a0174cca595204b32da9a66c513a1304e6d0 (patch) | |
| tree | b7fd1bcfa38c822d74750ee783154ed311c5f776 | |
| parent | tests: Improve support for gpgconf. (diff) | |
| download | gnupg2-d379a0174cca595204b32da9a66c513a1304e6d0.tar.xz gnupg2-d379a0174cca595204b32da9a66c513a1304e6d0.zip | |
gpg,tools: Make auto-key-retrieve configurable via gpgconf.
* g10/gpg.c (gpgconf_list): Add 'auto-key-retrieve'.
* tools/gpgconf-comp.c (gc_options_gpg): Likewise.
GnuPG-bug-id: 2381
Signed-off-by: Justus Winter <justus@g10code.com>
| -rw-r--r-- | g10/gpg.c | 1 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 2 |
2 files changed, 3 insertions, 0 deletions
@@ -1840,6 +1840,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 ("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 1840b8f32..d53947e7f 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -748,6 +748,8 @@ 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, + NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, GC_OPTION_NULL |