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/call-dirmngr.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/call-dirmngr.c')
| -rw-r--r-- | g10/call-dirmngr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index 362731e5f..9bc90fb2d 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -184,6 +184,10 @@ create_context (ctrl_t ctrl, assuan_context_t *r_ctx) assuan_context_t ctx; *r_ctx = NULL; + + if (opt.disable_dirmngr) + return gpg_error (GPG_ERR_NO_DIRMNGR); + err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT, opt.dirmngr_program, |