summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-05 12:20:16 +1100
committerDamien Miller <djm@mindrot.org>2002-02-05 12:20:16 +1100
commit664d6b9a8eb4519f3a7f7658886f5745a943d3ef (patch)
tree52fea2146fd9092fd70a61c4e36d1c6c1b41dfbd /serverloop.c
parent9ab47eeb229761173ce5da5b4976d9ea9a7b75e4 (diff)
- markus@cvs.openbsd.org 2002/01/31 15:00:05
[serverloop.c] no need for WNOHANG; ok stevesk@
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/serverloop.c b/serverloop.c
index 6c8719a3f..bd1d048ef 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.95 2002/01/16 13:17:51 markus Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.96 2002/01/31 15:00:05 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -673,7 +673,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
673 /* We no longer want our SIGCHLD handler to be called. */ 673 /* We no longer want our SIGCHLD handler to be called. */
674 mysignal(SIGCHLD, SIG_DFL); 674 mysignal(SIGCHLD, SIG_DFL);
675 675
676 wait_pid = waitpid(-1, &wait_status, child_terminated ? WNOHANG : 0); 676 wait_pid = waitpid(-1, &wait_status, 0);
677 if (wait_pid == -1) 677 if (wait_pid == -1)
678 packet_disconnect("wait: %.100s", strerror(errno)); 678 packet_disconnect("wait: %.100s", strerror(errno));
679 else if (wait_pid != pid) 679 else if (wait_pid != pid)