summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--serverloop.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b5635b423..a33bc464b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (dtucker) [configure.ac] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris. 2 - (dtucker) [configure.ac] Bug #1193: Define PASSWD_NEEDS_USERNAME on Solaris.
3 Works around limitation in Solaris' passwd program for changing passwords 3 Works around limitation in Solaris' passwd program for changing passwords
4 where the username is longer than 8 characters. ok djm@ 4 where the username is longer than 8 characters. ok djm@
5 - (dtucker) [serverloop.c] Get ifdef/ifndef the right way around for the bug
6 #1102 workaround.
5 7
620060623 820060623
7 - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add 9 - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add
@@ -4702,4 +4704,4 @@
4702 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4704 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4703 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4705 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4704 4706
4705$Id: ChangeLog,v 1.4347 2006/06/24 02:10:07 dtucker Exp $ 4707$Id: ChangeLog,v 1.4348 2006/06/24 06:58:45 dtucker Exp $
diff --git a/serverloop.c b/serverloop.c
index c1eb28853..e370f63a3 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -391,7 +391,7 @@ process_input(fd_set *readset)
391 len = read(fdout, buf, sizeof(buf)); 391 len = read(fdout, buf, sizeof(buf));
392 if (len < 0 && (errno == EINTR || errno == EAGAIN)) { 392 if (len < 0 && (errno == EINTR || errno == EAGAIN)) {
393 /* do nothing */ 393 /* do nothing */
394#ifdef PTY_ZEROREAD 394#ifndef PTY_ZEROREAD
395 } else if (len <= 0) { 395 } else if (len <= 0) {
396#else 396#else
397 } else if (len < 0 || (len == 0 && errno != 0)) { 397 } else if (len < 0 || (len == 0 && errno != 0)) {
@@ -408,7 +408,7 @@ process_input(fd_set *readset)
408 len = read(fderr, buf, sizeof(buf)); 408 len = read(fderr, buf, sizeof(buf));
409 if (len < 0 && (errno == EINTR || errno == EAGAIN)) { 409 if (len < 0 && (errno == EINTR || errno == EAGAIN)) {
410 /* do nothing */ 410 /* do nothing */
411#ifdef PTY_ZEROREAD 411#ifndef PTY_ZEROREAD
412 } else if (len <= 0) { 412 } else if (len <= 0) {
413#else 413#else
414 } else if (len < 0 || (len == 0 && errno != 0)) { 414 } else if (len < 0 || (len == 0 && errno != 0)) {