diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readpass.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -44,6 +44,9 @@ | |||
44 | - moritz@cvs.openbsd.org 2005/04/28 10:17:56 | 44 | - moritz@cvs.openbsd.org 2005/04/28 10:17:56 |
45 | [progressmeter.c ssh-keyscan.c] | 45 | [progressmeter.c ssh-keyscan.c] |
46 | add snprintf checks. ok djm@ markus@ | 46 | add snprintf checks. ok djm@ markus@ |
47 | - markus@cvs.openbsd.org 2005/05/02 21:13:22 | ||
48 | [readpass.c] | ||
49 | missing {} | ||
47 | 50 | ||
48 | 20050524 | 51 | 20050524 |
49 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | 52 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] |
@@ -2543,4 +2546,4 @@ | |||
2543 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2546 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2544 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2547 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2545 | 2548 | ||
2546 | $Id: ChangeLog,v 1.3773 2005/05/26 02:07:32 djm Exp $ | 2549 | $Id: ChangeLog,v 1.3774 2005/05/26 02:07:47 djm Exp $ |
diff --git a/readpass.c b/readpass.c index a193d0368..7914799a4 100644 --- a/readpass.c +++ b/readpass.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: readpass.c,v 1.32 2005/04/23 23:43:47 dtucker Exp $"); | 26 | RCSID("$OpenBSD: readpass.c,v 1.33 2005/05/02 21:13:22 markus Exp $"); |
27 | 27 | ||
28 | #include "xmalloc.h" | 28 | #include "xmalloc.h" |
29 | #include "misc.h" | 29 | #include "misc.h" |
@@ -106,9 +106,10 @@ read_passphrase(const char *prompt, int flags) | |||
106 | if (flags & RP_USE_ASKPASS) | 106 | if (flags & RP_USE_ASKPASS) |
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 | debug("read_passphrase: stdin is not a tty"); |
111 | use_askpass = 1; | 111 | use_askpass = 1; |
112 | } | ||
112 | } else { | 113 | } else { |
113 | rppflags |= RPP_REQUIRE_TTY; | 114 | rppflags |= RPP_REQUIRE_TTY; |
114 | ttyfd = open(_PATH_TTY, O_RDWR); | 115 | ttyfd = open(_PATH_TTY, O_RDWR); |