From d01c63bbb6bba011f479c476efc0ef5226d03594 Mon Sep 17 00:00:00 2001 From: djm Date: Tue, 5 Feb 2002 01:20:16 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2002/01/31 15:00:05 [serverloop.c] no need for WNOHANG; ok stevesk@ --- ChangeLog | 3 +++ serverloop.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index df3ade6f..261bf33b 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@ diff --git a/serverloop.c b/serverloop.c index 6c8719a3..bd1d048e 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) -- 2.45.1