diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 10:34:43 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 10:34:43 +0200 |
| commit | d989adadd33ed305a22f555d7d69db3cff4e83da (patch) | |
| tree | 225085c8a5b282438ca0df1cc8f046efcafa79f1 /ssh.c | |
| parent | - djm@cvs.openbsd.org 2007/06/13 00:21:27 (diff) | |
| download | openssh-d989adadd33ed305a22f555d7d69db3cff4e83da.tar.xz openssh-d989adadd33ed305a22f555d7d69db3cff4e83da.zip | |
- djm@cvs.openbsd.org 2007/06/14 21:43:25
[ssh.c]
handle EINTR when waiting for mux exit status properly
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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); |