summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:24:51 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:24:51 +1100
commit85830d1dc0b4728f26596ee1e1c901cd1ddd24e5 (patch)
tree1555460de9757febb1a028ab258e87ea8c48c69c
parenta5ebe0c39d30ce6c22bf152c638ea753c531ecb2 (diff)
- markus@cvs.openbsd.org 2002/01/11 23:02:18
[readpass.c] use _PATH_TTY
-rw-r--r--ChangeLog5
-rw-r--r--readpass.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index f211d6194..2fca0f7fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -140,6 +140,9 @@
140 - markus@cvs.openbsd.org 2002/01/11 20:14:11 140 - markus@cvs.openbsd.org 2002/01/11 20:14:11
141 [auth2-chall.c auth-skey.c] 141 [auth2-chall.c auth-skey.c]
142 use strlcpy not strlcat; mouring@ 142 use strlcpy not strlcat; mouring@
143 - markus@cvs.openbsd.org 2002/01/11 23:02:18
144 [readpass.c]
145 use _PATH_TTY
143 146
144 147
14520020121 14820020121
@@ -7288,4 +7291,4 @@
7288 - Wrote replacements for strlcpy and mkdtemp 7291 - Wrote replacements for strlcpy and mkdtemp
7289 - Released 1.0pre1 7292 - Released 1.0pre1
7290 7293
7291$Id: ChangeLog,v 1.1762 2002/01/22 12:24:33 djm Exp $ 7294$Id: ChangeLog,v 1.1763 2002/01/22 12:24:51 djm Exp $
diff --git a/readpass.c b/readpass.c
index 7e13828b7..c3cfe1dac 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,7 +32,7 @@
32 */ 32 */
33 33
34#include "includes.h" 34#include "includes.h"
35RCSID("$OpenBSD: readpass.c,v 1.24 2001/12/21 08:53:45 djm Exp $"); 35RCSID("$OpenBSD: readpass.c,v 1.25 2002/01/11 23:02:18 markus Exp $");
36 36
37#include "xmalloc.h" 37#include "xmalloc.h"
38#include "readpass.h" 38#include "readpass.h"
@@ -112,7 +112,7 @@ read_passphrase(const char *prompt, int flags)
112 use_askpass = 1; 112 use_askpass = 1;
113 } else { 113 } else {
114 rppflags |= RPP_REQUIRE_TTY; 114 rppflags |= RPP_REQUIRE_TTY;
115 ttyfd = open("/dev/tty", O_RDWR); 115 ttyfd = open(_PATH_TTY, O_RDWR);
116 if (ttyfd >= 0) 116 if (ttyfd >= 0)
117 close(ttyfd); 117 close(ttyfd);
118 else 118 else