- (stevesk) use mysignal() in protocol 1 loop now that the SIGCHLD

   handler has converged.

diff --git a/ChangeLog b/ChangeLog
index 58cc64a573ead4c7dc6c259e09464a6e59028d13..2cfa7f04c8c171891dc07c786b66fe5223e26ca5 100644 (file)
--- 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 d9791274ce973b13fc7335afce08bf5ca03fb070..0b44182ce3c1c4de4223d66c8aec8d023339f599 100644 (file)
--- 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);