Rocco Rutte:

[apps/madmutt.git] / pgp.c

diff --git a/pgp.c b/pgp.c
index 93c7733..45f7cf7 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -103,10 +103,16 @@ void pgp_forget_passphrase (void)
   mutt_message _("PGP passphrase forgotten.");
 }
 
-int pgp_use_gpg_agent (void)
-{
-  return option (OPTUSEGPGAGENT) && getenv ("GPG_TTY")
-    && getenv ("GPG_AGENT_INFO");
+int pgp_use_gpg_agent (void) {
+  char *tty;
+
+  if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO"))
+    return 0;
+
+  if ((tty = ttyname(0)))
+    setenv("GPG_TTY", tty, 0);
+
+  return 1;
 }
 
 char *pgp_keyid (pgp_key_t k)