summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2018-02-11 21:16:56 +0000
committerdtucker <dtucker@openbsd.org>2018-02-11 21:16:56 +0000
commit6197b654837c0ab7e19ac6a1e307fdb73ec6b9f9 (patch)
treefdb8854fdae23e0b9edcb27ca7b5b79ec2703a76 /usr.bin/ssh/ssh.c
parentUse the new APIs for setting block lengths and reading from/writing to (diff)
downloadwireguard-openbsd-6197b654837c0ab7e19ac6a1e307fdb73ec6b9f9.tar.xz
wireguard-openbsd-6197b654837c0ab7e19ac6a1e307fdb73ec6b9f9.zip
Don't reset signal handlers inside handlers.
The signal handlers from the original ssh1 code on which OpenSSH is based assume unreliable signals and reinstall their handlers. Since OpenBSD (and pretty much every current system) has reliable signals this is not needed. In the unlikely even that -portable is still being used on such systems we will deal with it in the compat layer. ok deraadt@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index c382fe9f445..3d8eefa1166 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.471 2018/01/23 05:27:21 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.472 2018/02/11 21:16:56 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2082,7 +2082,5 @@ main_sigchld_handler(int sig)
while ((pid = waitpid(-1, &status, WNOHANG)) > 0 ||
(pid < 0 && errno == EINTR))
;
-
- signal(sig, main_sigchld_handler);
errno = save_errno;
}