aboutsummaryrefslogtreecommitdiffstats
path: root/common/util.h
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-02-04 09:09:28 +0000
committerWerner Koch <[email protected]>2015-02-04 09:28:38 +0000
commit0de5c6a9a783ed9dc69cecbf34eadcaace4be243 (patch)
tree62db1cc6a50ba5448a0dbe352e6b721efbca0d76 /common/util.h
parentw32: Add manifest to gpg. (diff)
downloadgnupg-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 'common/util.h')
-rw-r--r--common/util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/util.h b/common/util.h
index 24107f533..9103e094b 100644
--- a/common/util.h
+++ b/common/util.h
@@ -254,6 +254,7 @@ const char *dirmngr_user_socket_name (void);
#define GNUPG_MODULE_NAME_GPGCONF 10
#define GNUPG_MODULE_NAME_DIRMNGR_LDAP 11
const char *gnupg_module_name (int which);
+void gnupg_module_name_flush_some (void);