===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -r1.298 -r1.299
--- src/usr.bin/ssh/ssh.c	2007/06/12 11:45:27	1.298
+++ src/usr.bin/ssh/ssh.c	2007/06/14 21:43:25	1.299
@@ -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
@@ -1443,8 +1443,11 @@
 			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);