diff options
| author | Werner Koch <wk@gnupg.org> | 2020-03-14 18:04:47 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-03-14 18:04:47 +0100 |
| commit | 6b306f45f4fbe36b90cec4685aabb267a61e283f (patch) | |
| tree | b992ac17f33003c835cb0a69be9e3203177531fe /tools/gpgconf-comp.c | |
| parent | gpg: Make use of the included key block in a signature. (diff) | |
| download | gnupg2-6b306f45f4fbe36b90cec4685aabb267a61e283f.tar.xz gnupg2-6b306f45f4fbe36b90cec4685aabb267a61e283f.zip | |
gpg: New option --auto-key-import
* g10/gpg.c (opts): New options --auto-key-import,
--no-auto-key-import, and --no-include-key-block.
(gpgconf_list): Add them.
* g10/options.h (opt): Add field flags.auto_key_import.
* g10/mainproc.c (check_sig_and_print): Use flag to enable that
feature.
* tools/gpgconf-comp.c: Give the new options a Basic config level.
--
Note that the --no variants of the options are intended for easy
disabling at the command line.
GnuPG-bug-id: 4856
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index f6d9c10b1..0700bcf1b 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -404,8 +404,9 @@ static known_option_t known_options_gpg[] = { "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, GC_ARG_TYPE_FILENAME }, { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, + { "auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, { "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT }, - { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, + { "include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT }, { "max-cert-depth", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, { "completes-needed", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, |