diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | serverloop.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -51,6 +51,9 @@ | |||
51 | - markus@cvs.openbsd.org 2002/01/31 13:35:11 | 51 | - markus@cvs.openbsd.org 2002/01/31 13:35:11 |
52 | [kexdh.c kexgex.c] | 52 | [kexdh.c kexgex.c] |
53 | cross check announced key type and type from key blob | 53 | cross check announced key type and type from key blob |
54 | - markus@cvs.openbsd.org 2002/01/31 15:00:05 | ||
55 | [serverloop.c] | ||
56 | no need for WNOHANG; ok stevesk@ | ||
54 | 57 | ||
55 | 20020130 | 58 | 20020130 |
56 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ | 59 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ |
@@ -7453,4 +7456,4 @@ | |||
7453 | - Wrote replacements for strlcpy and mkdtemp | 7456 | - Wrote replacements for strlcpy and mkdtemp |
7454 | - Released 1.0pre1 | 7457 | - Released 1.0pre1 |
7455 | 7458 | ||
7456 | $Id: ChangeLog,v 1.1813 2002/02/05 01:19:52 djm Exp $ | 7459 | $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 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.95 2002/01/16 13:17:51 markus Exp $"); | 38 | RCSID("$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) |