diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2006-03-04 04:12:59 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2006-03-04 04:12:59 +0000 |
| commit | c77da7d7edc5a911d20fe929083301c82e98132d (patch) | |
| tree | 1f51da89958653a80e46dfabcdfc431f72638b00 /usr.bin/ssh/serverloop.c | |
| parent | d2bb1a51fabd9df8038d826b93d05b85cd21b1a7 (diff) | |
move a debug() outside of a signal handler; ok markus@ a little while back
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 8aa447fac1c..c4d43358808 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.127 2006/02/20 17:02:44 stevesk Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.128 2006/03/04 04:12:58 djm Exp $"); #include <sys/types.h> #include <sys/wait.h> @@ -152,7 +152,6 @@ static void sigchld_handler(int sig) { int save_errno = errno; - debug("Received SIGCHLD."); child_terminated = 1; signal(SIGCHLD, sigchld_handler); notify_parent(); @@ -753,6 +752,7 @@ collect_children(void) sigaddset(&nset, SIGCHLD); sigprocmask(SIG_BLOCK, &nset, &oset); if (child_terminated) { + debug("Received SIGCHLD."); while ((pid = waitpid(-1, &status, WNOHANG)) > 0 || (pid < 0 && errno == EINTR)) if (pid > 0) |