diff options
| author | Werner Koch <wk@gnupg.org> | 2016-01-20 11:22:44 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-01-20 11:22:44 +0100 |
| commit | 499743387f4d07847a2842358bc54f9237e0c2a7 (patch) | |
| tree | 3d10ca58841ea18472ad0a407cb6d216f8ec7e63 /tools/gpgconf-comp.c | |
| parent | doc: Typo fix. (diff) | |
| download | gnupg2-499743387f4d07847a2842358bc54f9237e0c2a7.tar.xz gnupg2-499743387f4d07847a2842358bc54f9237e0c2a7.zip | |
agent: New option --pinentry-timeout
* agent/gpg-agent.c (oPinentryTimeout): New.
(opts): Add new option.
(parse_rereadable_options): PArse that option.
(main): Tell gpgconf about this option.
* agent/call-pinentry.c (start_pinentry): Send option to Pinentry.
* tools/gpgconf-comp.c (gc_options_gpg_agent): Add Option.
--
GnuPG-bug-id: 2222
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'tools/gpgconf-comp.c')
| -rw-r--r-- | tools/gpgconf-comp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 5e4bd58b2..45e5c90ea 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -582,6 +582,10 @@ static gc_option_t gc_options_gpg_agent[] = GC_LEVEL_EXPERT, "gnupg", N_("do not allow the reuse of old passphrases"), GC_ARG_TYPE_NONE, GC_BACKEND_GPG_AGENT }, + { "pinentry-timeout", GC_OPT_FLAG_RUNTIME, + GC_LEVEL_ADVANCED, "gnupg", + N_("|N|set the Pinentry timeout to N seconds"), + GC_ARG_TYPE_UINT32, GC_BACKEND_GPG_AGENT }, GC_OPTION_NULL }; |