diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-15 12:01:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-15 12:01:34 +1100 |
commit | ec04f360eb56a75e5f12393e80bc9ca39eacd5e8 (patch) | |
tree | 2f6ba3cbb464d644936369b66544e75352b46b2f | |
parent | 1cf76d97f91e16cd82ca457220a3e1b40ec2943a (diff) |
- 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | serverloop.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -200,6 +200,9 @@ | |||
200 | fix logout recording when privilege separation is disabled, analysis and | 200 | fix logout recording when privilege separation is disabled, analysis and |
201 | patch from vinschen at redhat.com; tested by dtucker@ ok deraadt@ | 201 | patch from vinschen at redhat.com; tested by dtucker@ ok deraadt@ |
202 | NB. ID sync only - patch already in portable | 202 | NB. ID sync only - patch already in portable |
203 | - djm@cvs.openbsd.org 2006/03/04 04:12:58 | ||
204 | [serverloop.c] | ||
205 | move a debug() outside of a signal handler; ok markus@ a little while back | ||
203 | 206 | ||
204 | 20060313 | 207 | 20060313 |
205 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 208 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -4101,4 +4104,4 @@ | |||
4101 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4104 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4102 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4105 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4103 | 4106 | ||
4104 | $Id: ChangeLog,v 1.4197 2006/03/15 01:01:14 djm Exp $ | 4107 | $Id: ChangeLog,v 1.4198 2006/03/15 01:01:34 djm Exp $ |
diff --git a/serverloop.c b/serverloop.c index 0a1bbf1ad..f4fb6b7b5 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.127 2006/02/20 17:02:44 stevesk Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.128 2006/03/04 04:12:58 djm Exp $"); |
39 | 39 | ||
40 | #include <sys/types.h> | 40 | #include <sys/types.h> |
41 | #include <sys/wait.h> | 41 | #include <sys/wait.h> |
@@ -152,7 +152,6 @@ static void | |||
152 | sigchld_handler(int sig) | 152 | sigchld_handler(int sig) |
153 | { | 153 | { |
154 | int save_errno = errno; | 154 | int save_errno = errno; |
155 | debug("Received SIGCHLD."); | ||
156 | child_terminated = 1; | 155 | child_terminated = 1; |
157 | #ifndef _UNICOS | 156 | #ifndef _UNICOS |
158 | mysignal(SIGCHLD, sigchld_handler); | 157 | mysignal(SIGCHLD, sigchld_handler); |
@@ -755,6 +754,7 @@ collect_children(void) | |||
755 | sigaddset(&nset, SIGCHLD); | 754 | sigaddset(&nset, SIGCHLD); |
756 | sigprocmask(SIG_BLOCK, &nset, &oset); | 755 | sigprocmask(SIG_BLOCK, &nset, &oset); |
757 | if (child_terminated) { | 756 | if (child_terminated) { |
757 | debug("Received SIGCHLD."); | ||
758 | while ((pid = waitpid(-1, &status, WNOHANG)) > 0 || | 758 | while ((pid = waitpid(-1, &status, WNOHANG)) > 0 || |
759 | (pid < 0 && errno == EINTR)) | 759 | (pid < 0 && errno == EINTR)) |
760 | if (pid > 0) | 760 | if (pid > 0) |