RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [serverloop.c] Get ifdef/ifndef the right way around for the bug 

#1102 workaround.
This commit is contained in:
Darren Tucker 2006-06-24 16:58:45 +10:00
parent 0249f93c4d
commit 03890e44cd
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -2,6 +2,8 @@
- (dtucker) [configure.ac] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris.
Works around limitation in Solaris' passwd program for changing passwords
where the username is longer than 8 characters. ok djm@
- (dtucker) [serverloop.c] Get ifdef/ifndef the right way around for the bug
#1102 workaround.
20060623
- (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
@ -4702,4 +4704,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4347 2006/06/24 02:10:07 dtucker Exp $
$Id: ChangeLog,v 1.4348 2006/06/24 06:58:45 dtucker Exp $

4
serverloop.c
View File

@ -391,7 +391,7 @@ process_input(fd_set *readset)
len = read(fdout, buf, sizeof(buf));
if (len < 0 && (errno == EINTR || errno == EAGAIN)) {
/* do nothing */
#ifdef PTY_ZEROREAD
#ifndef PTY_ZEROREAD
} else if (len <= 0) {
#else
} else if (len < 0 || (len == 0 && errno != 0)) {
@ -408,7 +408,7 @@ process_input(fd_set *readset)
len = read(fderr, buf, sizeof(buf));
if (len < 0 && (errno == EINTR || errno == EAGAIN)) {
/* do nothing */
#ifdef PTY_ZEROREAD
#ifndef PTY_ZEROREAD
} else if (len <= 0) {
#else
} else if (len < 0 || (len == 0 && errno != 0)) {