From 5ba29faa04960f19c0c3ff005c2b897c3094c1d6 Mon Sep 17 00:00:00 2001 From: des Date: Thu, 27 Jun 2002 22:42:11 +0000 Subject: Forcibly revert to mainline. --- crypto/openssh/serverloop.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'crypto/openssh/serverloop.c') diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c index 9210050..1a148fc 100644 --- a/crypto/openssh/serverloop.c +++ b/crypto/openssh/serverloop.c @@ -36,7 +36,6 @@ #include "includes.h" RCSID("$OpenBSD: serverloop.c,v 1.102 2002/06/11 05:46:20 mpech Exp $"); -RCSID("$FreeBSD$"); #include "xmalloc.h" #include "packet.h" @@ -144,7 +143,7 @@ sigchld_handler(int sig) int save_errno = errno; debug("Received SIGCHLD."); child_terminated = 1; - signal(SIGCHLD, sigchld_handler); + mysignal(SIGCHLD, sigchld_handler); notify_parent(); errno = save_errno; } @@ -497,7 +496,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; @@ -669,7 +668,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); while ((wait_pid = waitpid(-1, &wait_status, 0)) < 0) if (errno != EINTR) @@ -741,7 +740,7 @@ server_loop2(Authctxt *authctxt) debug("Entering interactive session for SSH2."); - signal(SIGCHLD, sigchld_handler); + mysignal(SIGCHLD, sigchld_handler); child_terminated = 0; connection_in = packet_get_connection_in(); connection_out = packet_get_connection_out(); -- cgit v1.1