diff options
| author | Daiki Ueno <[email protected]> | 2015-06-09 12:07:00 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-06-10 13:16:06 +0000 |
| commit | 691dae270b3b741178912599724d69adabdb48b9 (patch) | |
| tree | 83e874177d92b18481cddad587d5dbde76247fda /doc/gpg-agent.texi | |
| parent | doc: Do not used fixed file names in the manuals. (diff) | |
| download | gnupg-691dae270b3b741178912599724d69adabdb48b9.tar.gz gnupg-691dae270b3b741178912599724d69adabdb48b9.zip | |
agent: Add option --allow-emacs-pinentry
* agent/agent.h (opt): Add field allow_emacs_pinentry.
* agent/call-pinentry.c (start_pinentry): Act upon new var.
* agent/gpg-agent.c (oAllowEmacsPinentry): New.
(opts): Add option --allow-emacs-pinentry.
(parse_rereadable_options): Set this option.
* tools/gpgconf-comp.c (gc_options_gpg_agent): Add new option.
--
gpgconf-comp and manual entry added by wk.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc/gpg-agent.texi')
| -rw-r--r-- | doc/gpg-agent.texi | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index e5701441f..737b51bc0 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -314,6 +314,12 @@ which employs an additional external cache to implement such a policy. By using this option the Pinentry is advised not to make use of such a cache and instead always ask the user for the requested passphrase. +@item --allow-emacs-pinentry +@opindex allow-emacs-pinentry +Tell Pinentry to allow features to divert the passphrase entry to a +running Emacs instance. How this is exactly handled depends on the +version of the used Pinentry. + @item --ignore-cache-for-signing @opindex ignore-cache-for-signing This option will let @command{gpg-agent} bypass the passphrase cache for all @@ -676,7 +682,7 @@ again. Only certain options are honored: @code{quiet}, @code{debug-pinentry}, @code{no-grab}, @code{pinentry-program}, @code{default-cache-ttl}, @code{max-cache-ttl}, @code{ignore-cache-for-signing}, -@code{no-allow-external-cache}, +@code{no-allow-external-cache}, @code{allow-emacs-pinentry}, @code{no-allow-mark-trusted}, @code{disable-scdaemon}, and @code{disable-check-own-socket}. @code{scdaemon-program} is also supported but due to the current implementation, which calls the |