diff options
| author | Damien Miller <djm@mindrot.org> | 2002-02-05 12:20:16 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-02-05 12:20:16 +1100 |
| commit | 664d6b9a8eb4519f3a7f7658886f5745a943d3ef (patch) | |
| tree | 52fea2146fd9092fd70a61c4e36d1c6c1b41dfbd /serverloop.c | |
| parent | 9ab47eeb229761173ce5da5b4976d9ea9a7b75e4 (diff) | |
| download | openssh-git-664d6b9a8eb4519f3a7f7658886f5745a943d3ef.tar.gz | |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |