diff options
| author | Justus Winter <[email protected]> | 2017-08-08 09:43:22 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-08-08 09:43:22 +0000 |
| commit | c4506f624ed6854aa0ba1629aa2d1d43eb26900d (patch) | |
| tree | 0214b11c66a28e697eeefa5024d504f7a842b6bb /tools/gpgconf-comp.c | |
| parent | systemd-user: Drop redundant After=*.socket. (diff) | |
| download | gnupg-c4506f624ed6854aa0ba1629aa2d1d43eb26900d.tar.gz gnupg-c4506f624ed6854aa0ba1629aa2d1d43eb26900d.zip | |
gpg: Add option '--disable-dirmngr'.
* doc/gpg.texi: Document new option.
* g10/call-dirmngr.c (create_context): Fail if option is given.
* g10/gpg.c (cmd_and_opt_values): New value.
(opts): New option.
(gpgconf_list): Add new option.
(main): Handle new option.
* g10/options.h (struct opt): New field 'disable_dirmngr'.
* tools/gpgconf-comp.c (gc_options_gpg): New option.
GnuPG-bug-id: 3334
Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 59a6398c6..b066dada2 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -759,6 +759,9 @@ static gc_option_t gc_options_gpg[] = NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, { "no-auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, NULL, NULL, GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, + { "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT, + "gnupg", N_("disable all access to the dirmngr"), + GC_ARG_TYPE_NONE, GC_BACKEND_GPG }, GC_OPTION_NULL |