aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-07-28 10:52:26 +0000
committerWerner Koch <[email protected]>2015-07-28 11:52:12 +0000
commit18f1e627c697d75175b79fe095305fa775f20841 (patch)
treeb09f21ffd0061f8694daa56c0606f6f55ab758b2 /doc
parentscd: Fix size_t/unsigned int mismatch. (diff)
downloadgnupg-18f1e627c697d75175b79fe095305fa775f20841.tar.gz
gnupg-18f1e627c697d75175b79fe095305fa775f20841.zip
w32: Try more places to find an installed Pinentry.
* common/homedir.c (get_default_pinentry_name): Re-implement to support several choices for Windows. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'doc')
-rw-r--r--doc/gpg-agent.texi11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 4c4707257..62d23bbf1 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -403,6 +403,17 @@ 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.
+On a Windows platform the default is to use the first existing program
+from this list:
+@file{bin\pinentry.exe},
+@file{..\Gpg4win\bin\pinentry.exe},
+@file{..\Gpg4win\pinentry.exe},
+@file{..\GNU\GnuPG\pinentry.exe},
+@file{..\GNU\bin\pinentry.exe},
+@file{bin\pinentry-basic.exe}
+where the file names are relative to the GnuPG installation directory.
+
+
@item --pinentry-touch-file @var{filename}
@opindex pinentry-touch-file
By default the filename of the socket gpg-agent is listening for