diff options
author | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 18:34:43 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 18:34:43 +1000 |
commit | d989adadd33ed305a22f555d7d69db3cff4e83da (patch) | |
tree | 225085c8a5b282438ca0df1cc8f046efcafa79f1 | |
parent | 067263e84800c4b35f9bbbfafdd92aea493b6e0b (diff) |
- djm@cvs.openbsd.org 2007/06/14 21:43:25
[ssh.c]
handle EINTR when waiting for mux exit status properly
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 7 |
2 files changed, 9 insertions, 3 deletions
@@ -4,6 +4,9 @@ [scp.c] don't ftruncate() non-regular files; bz#1236 reported by wood AT 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 - (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 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 $ @@ -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); |