summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/readpass.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/openssh/readpass.c')
-rw-r--r--crypto/openssh/readpass.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/openssh/readpass.c b/crypto/openssh/readpass.c
index c2bacdc..7914799 100644
--- a/crypto/openssh/readpass.c
+++ b/crypto/openssh/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.33 2005/05/02 21:13:22 markus Exp $");
#include "xmalloc.h"
#include "misc.h"
@@ -106,15 +106,20 @@ read_passphrase(const char *prompt, int flags)
if (flags & RP_USE_ASKPASS)
use_askpass = 1;
else if (flags & RP_ALLOW_STDIN) {
- if (!isatty(STDIN_FILENO))
+ 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)
OpenPOWER on IntegriCloud