===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readpass.c,v
retrieving revision 1.30.2.2
retrieving revision 1.31
diff -u -r1.30.2.2 -r1.31
--- src/usr.bin/ssh/readpass.c	2005/09/02 03:45:00	1.30.2.2
+++ src/usr.bin/ssh/readpass.c	2004/10/29 22:53:56	1.31
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.30.2.2 2005/09/02 03:45:00 brad Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.31 2004/10/29 22:53:56 djm Exp $");
 
 #include <readpassphrase.h>
 
@@ -108,20 +108,15 @@
 	if (flags & RP_USE_ASKPASS)
 		use_askpass = 1;
 	else if (flags & RP_ALLOW_STDIN) {
-		if (!isatty(STDIN_FILENO)) {
-			debug("read_passphrase: stdin is not a tty");
+		if (!isatty(STDIN_FILENO))
 			use_askpass = 1;
-		}
 	} else {
 		rppflags |= RPP_REQUIRE_TTY;
 		ttyfd = open(_PATH_TTY, O_RDWR);
 		if (ttyfd >= 0)
 			close(ttyfd);
-		else {
-			debug("read_passphrase: can't open %s: %s", _PATH_TTY,
-			    strerror(errno));
+		else
 			use_askpass = 1;
-		}
 	}
 
 	if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL)