aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2020-11-04 12:48:18 +0000
committerAndre Heinecke <[email protected]>2020-11-04 12:48:18 +0000
commitb4cb91d5fbe2b8917d76d12eb72aaac0d97ed596 (patch)
treef952a3b1ce5800eead634dc8461cde1410dfd1f0
parentw32: Add windows subsystem variant of gpgconf (diff)
downloadgnupg-b4cb91d5fbe2b8917d76d12eb72aaac0d97ed596.tar.gz
gnupg-b4cb91d5fbe2b8917d76d12eb72aaac0d97ed596.zip
w32: Add another pinentry search path
* common/homedir.c (get_default_pinentry_name): Try ../bin/pinentry.exe -- In an installation layout where GnuPG is installed as a component of another software it might be useful to have pinentry placed in a different bin directory without the forced folder name of Gpg4win.
-rw-r--r--common/homedir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/homedir.c b/common/homedir.c
index 00e923d96..d64b74427 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -971,6 +971,8 @@ get_default_pinentry_name (int reset)
/* Try Gpg4win directory (with bin and without.) */
{ w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" },
{ w32_rootdir, "\\..\\Gpg4win\\pinentry.exe" },
+ /* Try a pinentry in a dir above us */
+ { w32_rootdir, "\\..\\bin\\pinentry.exe" },
/* Try old Gpgwin directory. */
{ w32_rootdir, "\\..\\GNU\\GnuPG\\pinentry.exe" },
/* Try a Pinentry from the common GNU dir. */