2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c68665a2..baef6fabd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,9 @@
    - markus@cvs.openbsd.org 2002/01/31 13:35:11
      [kexdh.c kexgex.c]
      cross check announced key type and type from key blob
+   - markus@cvs.openbsd.org 2002/01/31 15:00:05
+     [serverloop.c]
+     no need for WNOHANG; ok stevesk@
 
 20020130
  - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7453,4 +7456,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1813 2002/02/05 01:19:52 djm Exp $
+$Id: ChangeLog,v 1.1814 2002/02/05 01:20:16 djm Exp $
diff --git a/serverloop.c b/serverloop.c
index 6c8719a3f..bd1d048ef 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.95 2002/01/16 13:17:51 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.96 2002/01/31 15:00:05 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -673,7 +673,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
         /* We no longer want our SIGCHLD handler to be called. */
         mysignal(SIGCHLD, SIG_DFL);
 
-        wait_pid = waitpid(-1, &wait_status, child_terminated ? WNOHANG : 0);
+        wait_pid = waitpid(-1, &wait_status, 0);
         if (wait_pid == -1)
                 packet_disconnect("wait: %.100s", strerror(errno));
         else if (wait_pid != pid)