mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-23 18:23:25 +08:00
- (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
handler has converged.
This commit is contained in:
parent
8103de7d06
commit
e26a155415
@ -1,3 +1,7 @@
|
||||
20010726
|
||||
- (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
|
||||
handler has converged.
|
||||
|
||||
20010725
|
||||
- (bal) Added 'install-nokeys' to Makefile to assist package builders.
|
||||
|
||||
@ -6099,4 +6103,4 @@
|
||||
- Wrote replacements for strlcpy and mkdtemp
|
||||
- Released 1.0pre1
|
||||
|
||||
$Id: ChangeLog,v 1.1423 2001/07/25 16:24:33 mouring Exp $
|
||||
$Id: ChangeLog,v 1.1424 2001/07/26 17:51:49 stevesk Exp $
|
||||
|
@ -448,7 +448,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
|
||||
|
||||
/* Initialize the SIGCHLD kludge. */
|
||||
child_terminated = 0;
|
||||
signal(SIGCHLD, sigchld_handler);
|
||||
mysignal(SIGCHLD, sigchld_handler);
|
||||
|
||||
/* Initialize our global variables. */
|
||||
fdin = fdin_arg;
|
||||
@ -621,7 +621,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
|
||||
channel_free_all();
|
||||
|
||||
/* We no longer want our SIGCHLD handler to be called. */
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
mysignal(SIGCHLD, SIG_DFL);
|
||||
|
||||
wait_pid = waitpid(-1, &wait_status, child_terminated ? WNOHANG : 0);
|
||||
if (wait_pid == -1)
|
||||
@ -710,7 +710,7 @@ server_loop2(Authctxt *authctxt)
|
||||
if (writeset)
|
||||
xfree(writeset);
|
||||
|
||||
signal(SIGCHLD, SIG_DFL);
|
||||
mysignal(SIGCHLD, SIG_DFL);
|
||||
|
||||
while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
|
||||
session_close_by_pid(pid, status);
|
||||
|
Loading…
Reference in New Issue
Block a user