From d39a3cffc907b54e69c3f607c1f0b74e931696fd Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 10 Feb 2008 22:23:18 +1100 Subject: - djm@cvs.openbsd.org 2008/01/19 20:51:26 [ssh.c] ignore SIGPIPE in multiplex client mode - we can receive this if the server runs out of fds on us midway. Report and patch from gregory_shively AT fanniemae.com --- ChangeLog | 7 ++++++- ssh.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14a146dd3..0cd0ce98f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,11 @@ [clientloop.c] fd leak on session multiplexing error path. Report and patch from gregory_shively AT fanniemae.com + - djm@cvs.openbsd.org 2008/01/19 20:51:26 + [ssh.c] + ignore SIGPIPE in multiplex client mode - we can receive this if the + server runs out of fds on us midway. Report and patch from + gregory_shively AT fanniemae.com 20080119 - (djm) Silence noice from expr in ssh-copy-id; patch from @@ -3542,4 +3547,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.4822 2008/02/10 11:22:53 djm Exp $ +$Id: ChangeLog,v 1.4823 2008/02/10 11:23:18 djm Exp $ diff --git a/ssh.c b/ssh.c index e8906e00d..fe2f1adfb 100644 --- a/ssh.c +++ b/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.308 2007/11/03 02:03:49 deraadt Exp $ */ +/* $OpenBSD: ssh.c,v 1.309 2008/01/19 20:51:26 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -1393,6 +1393,8 @@ control_client(const char *path) if (options.forward_agent) flags |= SSHMUX_FLAG_AGENT_FWD; + signal(SIGPIPE, SIG_IGN); + buffer_init(&m); /* Send our command to server */ -- cgit v1.2.3