tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

[ssh.c]
     handle EINTR when waiting for mux exit status properly
This commit is contained in:
Darren Tucker 2007-06-25 18:34:43 +10:00
parent 067263e848
commit d989adadd3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -4,6 +4,9 @@
[scp.c] [scp.c]
don't ftruncate() non-regular files; bz#1236 reported by wood AT don't ftruncate() non-regular files; bz#1236 reported by wood AT
xmission.com; ok dtucker@ xmission.com; ok dtucker@
- djm@cvs.openbsd.org 2007/06/14 21:43:25
[ssh.c]
handle EINTR when waiting for mux exit status properly
20070614 20070614
- (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
@ -3079,4 +3082,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4703 2007/06/25 08:32:33 dtucker Exp $ $Id: ChangeLog,v 1.4704 2007/06/25 08:34:43 dtucker Exp $

7
ssh.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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"); debug2("Received EOF from master");
break; break;
} }
if (r == -1 && errno != EINTR) if (r == -1) {
if (errno == EINTR)
continue;
fatal("%s: read %s", __func__, strerror(errno)); fatal("%s: read %s", __func__, strerror(errno));
}
i += r; i += r;
} }
close(sock); close(sock);