diff options
| author | Werner Koch <[email protected]> | 2014-03-12 17:24:52 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-12 17:35:36 +0000 |
| commit | 6dd5d99a61f24aff862ccba9f7410d7f1af87c05 (patch) | |
| tree | 2fbd908268f7bf2b614884edabe09f2e00df5627 /g10 | |
| parent | dirmngr: Detect dead keyservers and try another one. (diff) | |
| download | gnupg-6dd5d99a61f24aff862ccba9f7410d7f1af87c05.tar.gz gnupg-6dd5d99a61f24aff862ccba9f7410d7f1af87c05.zip | |
gpg: Add option --dirmngr-program.
* g10/gpg.c: Add option --dirmngr-program.
* g10/options.h (struct opt): Add field dirmngr_program.
* g10/call-dirmngr.c (create_context): Use new var.
* dirmngr/dirmngr.c: Include gc-opt-flags.h.
(main): Remove GC_OPT_FLAG_*.
* tools/gpgconf-comp.c (GC_OPT_FLAG_NO_CHANGE): Move macro to ...
* common/gc-opt-flags.h: here.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/call-dirmngr.c | 2 | ||||
| -rw-r--r-- | g10/gpg.c | 4 | ||||
| -rw-r--r-- | g10/options.h | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/g10/call-dirmngr.c b/g10/call-dirmngr.c index 2310d8bd7..993533377 100644 --- a/g10/call-dirmngr.c +++ b/g10/call-dirmngr.c @@ -121,7 +121,7 @@ create_context (ctrl_t ctrl, assuan_context_t *r_ctx) err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT, opt.homedir, - NULL, + opt.dirmngr_program, opt.verbose, DBG_ASSUAN, NULL /*gpg_status2*/, ctrl); if (!err) @@ -346,6 +346,7 @@ enum cmd_and_opt_values oPersonalDigestPreferences, oPersonalCompressPreferences, oAgentProgram, + oDirmngrProgram, oDisplay, oTTYname, oTTYtype, @@ -739,7 +740,9 @@ static ARGPARSE_OPTS opts[] = { ARGPARSE_s_s (oPersonalCipherPreferences, "personal-cipher-prefs", "@"), ARGPARSE_s_s (oPersonalDigestPreferences, "personal-digest-prefs", "@"), ARGPARSE_s_s (oPersonalCompressPreferences, "personal-compress-prefs", "@"), + ARGPARSE_s_s (oAgentProgram, "agent-program", "@"), + ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"), ARGPARSE_s_s (oDisplay, "display", "@"), ARGPARSE_s_s (oTTYname, "ttyname", "@"), ARGPARSE_s_s (oTTYtype, "ttytype", "@"), @@ -2974,6 +2977,7 @@ main (int argc, char **argv) pers_compress_list=pargs.r.ret_str; break; case oAgentProgram: opt.agent_program = pargs.r.ret_str; break; + case oDirmngrProgram: opt.dirmngr_program = pargs.r.ret_str; break; case oDisplay: set_opt_session_env ("DISPLAY", pargs.r.ret_str); diff --git a/g10/options.h b/g10/options.h index 47b8bfb29..592e06698 100644 --- a/g10/options.h +++ b/g10/options.h @@ -101,6 +101,7 @@ struct int max_cert_depth; const char *homedir; const char *agent_program; + const char *dirmngr_program; /* Options to be passed to the gpg-agent */ session_env_t session_env; |