Attachment 764 Details for Bug 967 – check for pending child after setting up handler

[patch] check for pending child after setting up handler

openssh-serverloop-sigchld.patch (text/plain), 1.16 KB, created by Darren Tucker on 2005-01-10 23:47:23 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2005-01-10 23:47:23 AEDT

Size: 1.16 KB

patch

obsolete

>Index: serverloop.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/serverloop.c,v
>retrieving revision 1.117
>diff -u -p -r1.117 serverloop.c
>--- serverloop.c	13 Aug 2004 11:18:01 -0000	1.117
>+++ serverloop.c	10 Jan 2005 12:51:51 -0000
>@@ -502,6 +502,13 @@ server_loop(pid_t pid, int fdin_arg, int
> 	child_terminated = 0;
> 	mysignal(SIGCHLD, sigchld_handler);
> 
>+	/* XXX */
>+	if ((wait_pid = waitpid(-1, &wait_status, WNOHANG)) > 0) {
>+		notify_parent();
>+		waiting_termination = 1;
>+	} else
>+		wait_pid = -1;
>+
> 	/* Initialize our global variables. */
> 	fdin = fdin_arg;
> 	fdout = fdout_arg;
>@@ -674,9 +681,11 @@ server_loop(pid_t pid, int fdin_arg, int
> 	/* We no longer want our SIGCHLD handler to be called. */
> 	mysignal(SIGCHLD, SIG_DFL);
> 
>-	while ((wait_pid = waitpid(-1, &wait_status, 0)) < 0)
>-		if (errno != EINTR)
>+	while (wait_pid < 0) {
>+		wait_pid = waitpid(-1, &wait_status, 0);
>+		if (wait_pid < 0 && errno != EINTR)
> 			packet_disconnect("wait: %.100s", strerror(errno));
>+	}
> 	if (wait_pid != pid)
> 		error("Strange, wait returned pid %ld, expected %ld",
> 		    (long)wait_pid, (long)pid);

Actions: View | Diff

Attachments on bug 967: 761 | 762 | 763 | 764 | 767