commit 47fd8112b5ad0e83d895e5be9342b70832ea3075
author Ben Lindstrom <mouring@eviladmin.org> Tue Apr 02 20:48:19 2002 +0000
committer Ben Lindstrom <mouring@eviladmin.org> Tue Apr 02 20:48:19 2002 +0000
tree 8a72a7bd0295430d833bd1b6469dfabd5616dc6a
parent 03f3932829d5246d41c26b3d9f9482c618356430

   - markus@cvs.openbsd.org 2002/03/30 18:51:15
     [monitor.c serverloop.c sftp-int.c sftp.c sshd.c]
     check waitpid for EINTR; based on patch from peter@ifm.liu.se

monitor.c

diff --git a/monitor.c b/monitor.c
index 7b4e53e..03f8dc7 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.8 2002/03/27 17:45:42 mouring Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.9 2002/03/30 18:51:15 markus Exp $");
 
 #include <openssl/dh.h>
 
@@ -1211,8 +1211,9 @@
 	/* The child is terminating */
 	session_destroy_all(&mm_session_close);
 
-	if (waitpid(monitor->m_pid, &status, 0) == -1)
-		exit(1);
+	while (waitpid(monitor->m_pid, &status, 0) == -1)
+		if (errno != EINTR)
+			exit(1);
 
 	res = WIFEXITED(status) ? WEXITSTATUS(status) : 1;