summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2018-02-11 21:16:56 +0000
committerDamien Miller <djm@mindrot.org>2018-02-13 09:29:09 +1100
commit05046d907c211cb9b4cd21b8eff9e7a46cd6c5ab (patch)
tree12b3f77675e807c5b9958c80bdb4b7c94b6db9bb /ssh.c
parent3c51143c639ac686687c7acf9b373b8c08195ffb (diff)
upstream 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@ OpenBSD-Commit-ID: f53a1015cb6908431b92116130d285d71589612c
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/ssh.c b/ssh.c
index af4597f8..c0bdd38b 100644
--- a/ssh.c
+++ b/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
@@ -2132,7 +2132,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;
}