From b356eddf3d7a1ed0fae808b9277134d50f4974af Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 17 Aug 2022 17:01:44 +0200 Subject: [PATCH] gpgconf: Make --auto-key-import and --include-key-block visible again. * tools/gpgconf-comp.c: Add options. -- Fixes-commit: 7a3a1ef3707194e1086c452d005319c519905d3e GnuPG-bug-id: 6138 --- NEWS | 3 +++ tools/gpgconf-comp.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index c041949a9..223b8ca86 100644 --- a/NEWS +++ b/NEWS @@ -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 },