diff options
| author | Werner Koch <[email protected]> | 2022-08-17 15:01:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-08-17 15:01:44 +0000 |
| commit | b356eddf3d7a1ed0fae808b9277134d50f4974af (patch) | |
| tree | 89a2d66f9375f0ba5f946bbd5b1bb9082933c58d | |
| parent | agent: Fix bug introduced earlier today. (diff) | |
| download | gnupg-b356eddf3d7a1ed0fae808b9277134d50f4974af.tar.gz gnupg-b356eddf3d7a1ed0fae808b9277134d50f4974af.zip | |
gpgconf: Make --auto-key-import and --include-key-block visible again.
* tools/gpgconf-comp.c: Add options.
--
Fixes-commit: 7a3a1ef3707194e1086c452d005319c519905d3e
GnuPG-bug-id: 6138
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -18,6 +18,9 @@ Noteworthy changes in version 2.2.37 (unreleased) * gpg: --card-status shows the application type for non-openpgp cards again. [rG8e393e2592] + * gpg: The options --auto-key-import and --include-key-block are + again listed by gpgconf. [T6138] + * agent: New options --no-user-trustlist and --sys-trustlist-name. [T5990] diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index fa1a7dc61..c9bdfeb3a 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -404,8 +404,12 @@ static known_option_t known_options_gpg[] = GC_ARG_TYPE_FILENAME }, { "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, { "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED }, + { "auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC }, + { "no-auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, { "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 }, + { "no-include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE }, { "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 }, |