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

   #1102 workaround.

diff --git a/ChangeLog b/ChangeLog
index bb6246dc8e7d4913dbe0c8c4b0e40fae6aeaaac7..c03e172ee868185a049d66dabb00975a6e679a7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/serverloop.c b/serverloop.c
index c1eb2885341c7c91c58633e25822772d13735eed..e370f63a3ada40394a870ce9c8e8a6ef2f8f33c7 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -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)) {