- djm@cvs.openbsd.org 2007/06/14 21:43:25

     [ssh.c]
     handle EINTR when waiting for mux exit status properly

1 files changed, 5 insertions, 2 deletions

diff --git a/ssh.c b/ssh.c
index 9af61d3c2..ab9da1e97 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.298 2007/06/12 11:45:27 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.299 2007/06/14 21:43:25 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1468,8 +1468,11 @@ control_client(const char *path)
                         debug2("Received EOF from master");
                         break;
                 }
-                if (r == -1 && errno != EINTR)
+                if (r == -1) {
+                        if (errno == EINTR)
+                                continue;
                         fatal("%s: read %s", __func__, strerror(errno));
+                }
                 i += r;
         }
         close(sock);