diff options
| author | Werner Koch <[email protected]> | 2003-01-09 12:59:25 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-01-09 12:59:25 +0000 |
| commit | c13b76ca6a495cda6e51934a7788f48ca6f3bb0e (patch) | |
| tree | d52174e8d500d7db90181bf71624d69d0c6836c5 /agent/simple-pwquery.c | |
| parent | * keygen.c (keygen_set_std_prefs): Warn when setting an IDEA preference (diff) | |
| download | gnupg-c13b76ca6a495cda6e51934a7788f48ca6f3bb0e.tar.gz gnupg-c13b76ca6a495cda6e51934a7788f48ca6f3bb0e.zip | |
Updated from latest NewPG project
Diffstat (limited to '')
| -rw-r--r-- | agent/simple-pwquery.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/agent/simple-pwquery.c b/agent/simple-pwquery.c index 5bb08afec..afdc4e2a4 100644 --- a/agent/simple-pwquery.c +++ b/agent/simple-pwquery.c @@ -177,9 +177,10 @@ agent_send_all_options (int fd) return rc; } - if (ttyname (1)) - dft_ttyname = ttyname (1); - if (dft_ttyname) + dft_ttyname = getenv ("GPG_TTY"); + if ((!dft_ttyname || !*dft_ttyname) && ttyname (0)) + dft_ttyname = ttyname (0); + if (dft_ttyname && *dft_ttyname) { if ((rc=agent_send_option (fd, "ttyname", dft_ttyname))) return rc; |