47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 96faa0de6c673a2ce84736eba37fc9fb723d9e5c Mon Sep 17 00:00:00 2001
|
|
From: "djm@openbsd.org" <djm@openbsd.org>
|
|
Date: Fri, 1 Jul 2022 00:36:30 +0000
|
|
Subject: upstream: ignore SIGPIPE earlier in main(), specifically before
|
|
|
|
muxclient() which performs operations that could cause one; Reported by Noam
|
|
Lewis via bz3454, ok dtucker@
|
|
|
|
OpenBSD-Commit-ID: 63d8e13276869eebac6d7a05d5a96307f9026e47
|
|
|
|
Conflict:NA
|
|
Reference:https://anongit.mindrot.org/openssh.git/patch/?id=96faa0de6c673a2ce84736eba37fc9fb723d9e5c
|
|
---
|
|
ssh.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ssh.c b/ssh.c
|
|
index f55ff73..e987cd5 100644
|
|
--- a/ssh.c
|
|
+++ b/ssh.c
|
|
@@ -1,4 +1,4 @@
|
|
-/* $OpenBSD: ssh.c,v 1.569 2021/09/20 04:02:13 dtucker Exp $ */
|
|
+/* $OpenBSD: ssh.c,v 1.575 2022/07/01 00:36:30 djm Exp $ */
|
|
/*
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
@@ -1135,6 +1135,8 @@ main(int ac, char **av)
|
|
}
|
|
}
|
|
|
|
+ ssh_signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
|
|
+
|
|
/*
|
|
* Initialize "log" output. Since we are the client all output
|
|
* goes to stderr unless otherwise specified by -y or -E.
|
|
@@ -1660,7 +1662,6 @@ main(int ac, char **av)
|
|
options.num_system_hostfiles);
|
|
tilde_expand_paths(options.user_hostfiles, options.num_user_hostfiles);
|
|
|
|
- ssh_signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
|
|
ssh_signal(SIGCHLD, main_sigchld_handler);
|
|
|
|
/* Log into the remote system. Never returns if the login fails. */
|
|
--
|
|
2.33.0
|
|
|