- 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

1 files changed, 4 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index 7b4e53eb5..03f8dc74a 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 @@ mm_answer_term(int socket, Buffer *req)
         /* 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;