- djm@cvs.openbsd.org 2006/03/04 04:12:58

[serverloop.c]
     move a debug() outside of a signal handler; ok markus@ a little while back

ChangeLog

@@ -200,6 +200,9 @@
      fix logout recording when privilege separation is disabled, analysis and
      patch from vinschen at redhat.com; tested by dtucker@ ok deraadt@
      NB. ID sync only - patch already in portable
+   - djm@cvs.openbsd.org 2006/03/04 04:12:58
+     [serverloop.c]
+     move a debug() outside of a signal handler; ok markus@ a little while back
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4101,4 +4104,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4197 2006/03/15 01:01:14 djm Exp $
+$Id: ChangeLog,v 1.4198 2006/03/15 01:01:34 djm Exp $

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;
 #ifndef _UNICOS
 	mysignal(SIGCHLD, sigchld_handler);
@@ -755,6 +754,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)