From: stevesk <stevesk>
Date: Thu, 26 Jul 2001 17:51:49 +0000 (+0000)
Subject:  - (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
X-Git-Tag: V_2_9_9_P1~155
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/42ad0eec09291ce68a5b73563d3a742758db6110

 - (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD
   handler has converged.
---

diff --git a/ChangeLog b/ChangeLog
index 58cc64a5..2cfa7f04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/serverloop.c b/serverloop.c
index d9791274..0b44182c 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)
 
 	/* 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);