summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Steves <stevesk@pobox.com>2001-07-26 17:51:49 +0000
committerKevin Steves <stevesk@pobox.com>2001-07-26 17:51:49 +0000
commite26a155415ffb384fd95296b2ed9e129169abd10 (patch)
treeedf95896f663364b5aa27f4bcf6a1ed268b94729
parent8103de7d06ca2ed9157f73a6c2eb6ee1567aebab (diff)
- (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
handler has converged.
-rw-r--r--ChangeLog6
-rw-r--r--serverloop.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index ed917a716..ed6c3308a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120010726
2 - (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
3 handler has converged.
4
120010725 520010725
2 - (bal) Added 'install-nokeys' to Makefile to assist package builders. 6 - (bal) Added 'install-nokeys' to Makefile to assist package builders.
3 7
@@ -6099,4 +6103,4 @@
6099 - Wrote replacements for strlcpy and mkdtemp 6103 - Wrote replacements for strlcpy and mkdtemp
6100 - Released 1.0pre1 6104 - Released 1.0pre1
6101 6105
6102$Id: ChangeLog,v 1.1423 2001/07/25 16:24:33 mouring Exp $ 6106$Id: ChangeLog,v 1.1424 2001/07/26 17:51:49 stevesk Exp $
diff --git a/serverloop.c b/serverloop.c
index d9791274c..0b44182ce 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -448,7 +448,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
448 448
449 /* Initialize the SIGCHLD kludge. */ 449 /* Initialize the SIGCHLD kludge. */
450 child_terminated = 0; 450 child_terminated = 0;
451 signal(SIGCHLD, sigchld_handler); 451 mysignal(SIGCHLD, sigchld_handler);
452 452
453 /* Initialize our global variables. */ 453 /* Initialize our global variables. */
454 fdin = fdin_arg; 454 fdin = fdin_arg;
@@ -621,7 +621,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
621 channel_free_all(); 621 channel_free_all();
622 622
623 /* We no longer want our SIGCHLD handler to be called. */ 623 /* We no longer want our SIGCHLD handler to be called. */
624 signal(SIGCHLD, SIG_DFL); 624 mysignal(SIGCHLD, SIG_DFL);
625 625
626 wait_pid = waitpid(-1, &wait_status, child_terminated ? WNOHANG : 0); 626 wait_pid = waitpid(-1, &wait_status, child_terminated ? WNOHANG : 0);
627 if (wait_pid == -1) 627 if (wait_pid == -1)
@@ -710,7 +710,7 @@ server_loop2(Authctxt *authctxt)
710 if (writeset) 710 if (writeset)
711 xfree(writeset); 711 xfree(writeset);
712 712
713 signal(SIGCHLD, SIG_DFL); 713 mysignal(SIGCHLD, SIG_DFL);
714 714
715 while ((pid = waitpid(-1, &status, WNOHANG)) > 0) 715 while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
716 session_close_by_pid(pid, status); 716 session_close_by_pid(pid, status);