diff options
| author | Werner Koch <[email protected]> | 2015-02-04 09:09:28 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-02-04 09:28:38 +0000 |
| commit | 0de5c6a9a783ed9dc69cecbf34eadcaace4be243 (patch) | |
| tree | 62db1cc6a50ba5448a0dbe352e6b721efbca0d76 /doc | |
| parent | w32: Add manifest to gpg. (diff) | |
| download | gnupg-0de5c6a9a783ed9dc69cecbf34eadcaace4be243.tar.gz gnupg-0de5c6a9a783ed9dc69cecbf34eadcaace4be243.zip | |
gpg-agent: Use "pinentry-basic" as fallback.
* common/homedir.c (get_default_pinentry_name): New.
(gnupg_module_name): Use that for the default pinentry.
(gnupg_module_name_flush_some): New.
* agent/gpg-agent.c (agent_sighup_action): Flush some module names.
* agent/call-pinentry.c (start_pinentry): Do not modify
opt.pinentry_program.
--
The idea with this change is that under Windows we can install a
simple native Windows pinentry as "pinentry-basic" and a full GUI
version may then later install pinentry-gtk etc which would then
automatically be used.
Unfortunately installing another pinentry from a different package
would clobber the GnuPG core directory which is not nice. To fix that
we would need to agree on standard installation directories for GUIs
to also look there.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gpg-agent.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi index 93264988d..84a7d60d9 100644 --- a/doc/gpg-agent.texi +++ b/doc/gpg-agent.texi @@ -445,8 +445,10 @@ This option does nothing yet. @item --pinentry-program @var{filename} @opindex pinentry-program -Use program @var{filename} as the PIN entry. The default is installation -dependent. +Use program @var{filename} as the PIN entry. The default is +installation dependent. With the default configuration the name of +the default pinentry is @file{pinentry}; if that file does not exist +but a @file{pinentry-basic} exist the latter is used. @item --pinentry-touch-file @var{filename} @opindex pinentry-touch-file |