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 /g10/gpg.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 'g10/gpg.c')
| -rw-r--r-- | g10/gpg.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -374,6 +374,7 @@ enum cmd_and_opt_values oPersonalCompressPreferences, oAgentProgram, oDirmngrProgram, + oDisableDirmngr, oDisplay, oTTYname, oTTYtype, @@ -837,6 +838,7 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oAgentProgram, "agent-program", "@"), ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"), + ARGPARSE_s_n (oDisableDirmngr, "disable-dirmngr", "@"), ARGPARSE_s_s (oDisplay, "display", "@"), ARGPARSE_s_s (oTTYname, "ttyname", "@"), ARGPARSE_s_s (oTTYtype, "ttytype", "@"), @@ -1857,6 +1859,7 @@ gpgconf_list (const char *configfile) es_printf ("compliance:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, "gnupg"); es_printf ("default-new-key-algo:%lu:\n", GC_OPT_FLAG_NONE); es_printf ("trust-model:%lu:\n", GC_OPT_FLAG_NONE); + es_printf ("disable-dirmngr:%lu:\n", GC_OPT_FLAG_NONE); /* The next one is an info only item and should match the macros at the top of keygen.c */ @@ -3388,6 +3391,7 @@ main (int argc, char **argv) break; case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break; + case oDisableDirmngr: opt.disable_dirmngr = 1; break; case oWeakDigest: additional_weak_digest(pargs.r.ret_str); break; |