From d49d70a8028d98557a73762f8e00825329b86647 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Thu, 26 May 2005 02:05:28 +0000
Subject: [PATCH]    - dtucker@cvs.openbsd.org 2005/04/23 23:43:47     
 [readpass.c]      Add debug message if read_passphrase can't open /dev/tty;
 bz #471;      ok djm@

---
 ChangeLog  | 4 ++++
 readpass.c | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 646e3cf1..7d7ce627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
      [ssh.c]
      don't allocate a pty when -n flag (/dev/null stdin) is set, patch from
      ignasi.roca AT fujitsu-siemens.com (bz #829); ok dtucker@
+   - dtucker@cvs.openbsd.org 2005/04/23 23:43:47
+     [readpass.c]
+     Add debug message if read_passphrase can't open /dev/tty; bz #471;
+     ok djm@
 
 20050524
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
diff --git a/readpass.c b/readpass.c
index c2bacdcd..a193d036 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.31 2004/10/29 22:53:56 djm Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.32 2005/04/23 23:43:47 dtucker Exp $");
 
 #include "xmalloc.h"
 #include "misc.h"
@@ -107,14 +107,18 @@ read_passphrase(const char *prompt, int flags)
 		use_askpass = 1;
 	else if (flags & RP_ALLOW_STDIN) {
 		if (!isatty(STDIN_FILENO))
+			debug("read_passphrase: stdin is not a tty");
 			use_askpass = 1;
 	} else {
 		rppflags |= RPP_REQUIRE_TTY;
 		ttyfd = open(_PATH_TTY, O_RDWR);
 		if (ttyfd >= 0)
 			close(ttyfd);
-		else
+		else {
+			debug("read_passphrase: can't open %s: %s", _PATH_TTY,
+			    strerror(errno));
 			use_askpass = 1;
+		}
 	}
 
 	if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL)
-- 
2.45.1