From c8f6f6bbc8b203e633d382aa84862807c1aeb3d1 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Wed, 4 Nov 2020 13:48:18 +0100 Subject: [PATCH] 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. (cherry picked from commit b4cb91d5fbe2b8917d76d12eb72aaac0d97ed596) --- common/homedir.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/homedir.c b/common/homedir.c index dd1575cd0..15475c256 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -994,6 +994,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. */