summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index d1a244abf..880ec45e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [scp.c] 4 [scp.c]
5 don't ftruncate() non-regular files; bz#1236 reported by wood AT 5 don't ftruncate() non-regular files; bz#1236 reported by wood AT
6 xmission.com; ok dtucker@ 6 xmission.com; ok dtucker@
7 - djm@cvs.openbsd.org 2007/06/14 21:43:25
8 [ssh.c]
9 handle EINTR when waiting for mux exit status properly
7 10
820070614 1120070614
9 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the 12 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
@@ -3079,4 +3082,4 @@
3079 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3082 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3080 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3083 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3081 3084
3082$Id: ChangeLog,v 1.4703 2007/06/25 08:32:33 dtucker Exp $ 3085$Id: ChangeLog,v 1.4704 2007/06/25 08:34:43 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 9af61d3c2..ab9da1e97 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh.c,v 1.298 2007/06/12 11:45:27 djm Exp $ */ 1/* $OpenBSD: ssh.c,v 1.299 2007/06/14 21:43:25 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1468,8 +1468,11 @@ control_client(const char *path)
1468 debug2("Received EOF from master"); 1468 debug2("Received EOF from master");
1469 break; 1469 break;
1470 } 1470 }
1471 if (r == -1 && errno != EINTR) 1471 if (r == -1) {
1472 if (errno == EINTR)
1473 continue;
1472 fatal("%s: read %s", __func__, strerror(errno)); 1474 fatal("%s: read %s", __func__, strerror(errno));
1475 }
1473 i += r; 1476 i += r;
1474 } 1477 }
1475 close(sock); 1478 close(sock);