- 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@

diff --git a/ChangeLog b/ChangeLog
index 646e3cf134d6adb4e4776d34e4b90600e4138dcb..7d7ce62729afa3c22a361a7a31113300636e1425 100644 (file)
--- 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 c2bacdcd48ea9a5fb6a59f067cb238ffae009b15..a193d0368637e8ec3de34285f8ea91ef8ad3d59a 100644 (file)
--- 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)