39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
|
From d33ff14309e33aa79fdf95e1bc4facafa80b90a9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stepan Broz <sbroz@redhat.com>
|
||
|
|
Date: Tue, 25 Jun 2024 17:38:22 +0200
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
---
|
||
|
|
ssh.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/ssh.c b/ssh.c
|
||
|
|
index 786e26d..e037c66 100644
|
||
|
|
--- a/ssh.c
|
||
|
|
+++ b/ssh.c
|
||
|
|
@@ -1115,6 +1115,8 @@ main(int ac, char **av)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ 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.
|
||
|
|
@@ -1545,7 +1547,6 @@ main(int ac, char **av)
|
||
|
|
options.num_system_hostfiles);
|
||
|
|
tilde_expand_paths(options.user_hostfiles, options.num_user_hostfiles);
|
||
|
|
|
||
|
|
- signal(SIGPIPE, SIG_IGN); /* ignore SIGPIPE early */
|
||
|
|
signal(SIGCHLD, main_sigchld_handler);
|
||
|
|
|
||
|
|
/* Log into the remote system. Never returns if the login fails. */
|
||
|
|
--
|
||
|
|
2.45.2
|
||
|
|
|