summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-12-06 16:17:15 +0100
committerDamien Miller <djm@mindrot.org>2024-12-07 11:16:01 +0100
commit5488810359f0fd91e2f7b919c70a3798e46376cb (patch)
tree9d95eb462884b55cbee41c19165e2162fa2fccbb
parentupstream: sync -o option lists with ssh.1; requested jmc@ (diff)
downloadopenssh-5488810359f0fd91e2f7b919c70a3798e46376cb.tar.xz
openssh-5488810359f0fd91e2f7b919c70a3798e46376cb.zip
upstream: ignore SIGPIPE here; some downstreams have had this for
years... OpenBSD-Commit-ID: 73674ee4f8ceb8fc9cb8de71d8ddea0c721eb035
-rw-r--r--ssh-keyscan.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 2a9f47a8d..3436c0b5c 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.164 2024/10/18 05:32:51 djm Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.165 2024/12/06 15:17:15 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -802,6 +802,7 @@ main(int argc, char **argv)
for (j = 0; j < maxfd; j++)
read_wait[j].fd = -1;
+ ssh_signal(SIGPIPE, SIG_IGN);
for (j = 0; j < fopt_count; j++) {
if (argv[j] == NULL)
fp = stdin;