tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2005/05/02 21:13:22

Browse Source 
[readpass.c]
     missing {}
This commit is contained in:
Damien Miller 2005-05-26 12:07:47 +10:00
parent 41bfc29ea5
commit d2ebd450f0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -44,6 +44,9 @@
- moritz@cvs.openbsd.org 2005/04/28 10:17:56 - moritz@cvs.openbsd.org 2005/04/28 10:17:56
[progressmeter.c ssh-keyscan.c] [progressmeter.c ssh-keyscan.c]
add snprintf checks. ok djm@ markus@ add snprintf checks. ok djm@ markus@
- markus@cvs.openbsd.org 2005/05/02 21:13:22
[readpass.c]
missing {}
20050524 20050524
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@ -2543,4 +2546,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3773 2005/05/26 02:07:32 djm Exp $ $Id: ChangeLog,v 1.3774 2005/05/26 02:07:47 djm Exp $

5
readpass.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: readpass.c,v 1.32 2005/04/23 23:43:47 dtucker Exp $"); RCSID("$OpenBSD: readpass.c,v 1.33 2005/05/02 21:13:22 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "misc.h" #include "misc.h"
@ -106,9 +106,10 @@ read_passphrase(const char *prompt, int flags)
if (flags & RP_USE_ASKPASS) if (flags & RP_USE_ASKPASS)
use_askpass = 1; use_askpass = 1;
else if (flags & RP_ALLOW_STDIN) { else if (flags & RP_ALLOW_STDIN) {
if (!isatty(STDIN_FILENO)) if (!isatty(STDIN_FILENO)) {
debug("read_passphrase: stdin is not a tty"); debug("read_passphrase: stdin is not a tty");
use_askpass = 1; use_askpass = 1;
}
} else { } else {
rppflags |= RPP_REQUIRE_TTY; rppflags |= RPP_REQUIRE_TTY;
ttyfd = open(_PATH_TTY, O_RDWR); ttyfd = open(_PATH_TTY, O_RDWR);