From fd5658ec0a812a85d29051ec9ad6742cf3dfc36e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adeodato=20Sim=C3=B3?= <asp16@alu.ua.es>
Date: Wed, 21 Sep 2005 04:50:31 +0000
Subject: [PATCH] When using GPG agent in classic mode, set GPG_TTY if it isn't
 already set instead of bailing out. Closes: #2072.

---
 pgp.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pgp.c b/pgp.c
index 56042a99..f8dc6771 100644
--- a/pgp.c
+++ b/pgp.c
@@ -106,7 +106,15 @@ void pgp_forget_passphrase (void)
 
 int pgp_use_gpg_agent (void)
 {
-  return option (OPTUSEGPGAGENT) && getenv ("GPG_TTY") && getenv ("GPG_AGENT_INFO");
+  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)
-- 
2.40.0