summaryrefslogtreecommitdiff
path: root/readpass.c
diff options
context:
space:
mode:
Diffstat (limited to 'readpass.c')
-rw-r--r--readpass.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/readpass.c b/readpass.c
index c2bacdcd4..a193d0368 100644
--- a/readpass.c
+++ b/readpass.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: readpass.c,v 1.31 2004/10/29 22:53:56 djm Exp $"); 26RCSID("$OpenBSD: readpass.c,v 1.32 2005/04/23 23:43:47 dtucker Exp $");
27 27
28#include "xmalloc.h" 28#include "xmalloc.h"
29#include "misc.h" 29#include "misc.h"
@@ -107,14 +107,18 @@ read_passphrase(const char *prompt, int flags)
107 use_askpass = 1; 107 use_askpass = 1;
108 else if (flags & RP_ALLOW_STDIN) { 108 else if (flags & RP_ALLOW_STDIN) {
109 if (!isatty(STDIN_FILENO)) 109 if (!isatty(STDIN_FILENO))
110 debug("read_passphrase: stdin is not a tty");
110 use_askpass = 1; 111 use_askpass = 1;
111 } else { 112 } else {
112 rppflags |= RPP_REQUIRE_TTY; 113 rppflags |= RPP_REQUIRE_TTY;
113 ttyfd = open(_PATH_TTY, O_RDWR); 114 ttyfd = open(_PATH_TTY, O_RDWR);
114 if (ttyfd >= 0) 115 if (ttyfd >= 0)
115 close(ttyfd); 116 close(ttyfd);
116 else 117 else {
118 debug("read_passphrase: can't open %s: %s", _PATH_TTY,
119 strerror(errno));
117 use_askpass = 1; 120 use_askpass = 1;
121 }
118 } 122 }
119 123
120 if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL) 124 if ((flags & RP_USE_ASKPASS) && getenv("DISPLAY") == NULL)