diff options
| author |   djm <djm@openbsd.org> | 2007-09-04 03:21:03 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2007-09-04 03:21:03 +0000 |
| commit | b8533c9b014f9bfb9c1f12a43a601f7228118471 (patch) | |
| tree | 30d1b3f6c80e6bc591c52f99933f04ed41f7737d /usr.bin/ssh/ssh.c | |
| parent | Use err(3) functions. input and ok millert. (diff) | |
| download | wireguard-openbsd-b8533c9b014f9bfb9c1f12a43a601f7228118471.tar.xz wireguard-openbsd-b8533c9b014f9bfb9c1f12a43a601f7228118471.zip | |
make file descriptor passing code return an error rather than call fatal()
when it encounters problems, and use this to make session multiplexing
masters survive slaves failing to pass all stdio FDs; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 7f656522e95..db350e2cbb4 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.301 2007/08/07 07:32:53 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.302 2007/09/04 03:21:03 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1406,9 +1406,10 @@ control_client(const char *path) if (ssh_msg_send(sock, SSHMUX_VER, &m) == -1) fatal("%s: msg_send", __func__); - mm_send_fd(sock, STDIN_FILENO); - mm_send_fd(sock, STDOUT_FILENO); - mm_send_fd(sock, STDERR_FILENO); + if (mm_send_fd(sock, STDIN_FILENO) == -1 || + mm_send_fd(sock, STDOUT_FILENO) == -1 || + mm_send_fd(sock, STDERR_FILENO) == -1) + fatal("%s: send fds failed", __func__); /* Wait for reply, so master has a chance to gather ttymodes */ buffer_clear(&m); |