summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2020-07-03 10:11:33 +0000
committermarkus <markus@openbsd.org>2020-07-03 10:11:33 +0000
commit161d8759a3f67018ee76b8dc092e33cf787ad7a8 (patch)
treef814aad2e11fe5811225312f2a396315f75d03d4
parentdon't exit the listener on send_rexec_state errors; ok djm (diff)
downloadwireguard-openbsd-161d8759a3f67018ee76b8dc092e33cf787ad7a8.tar.xz
wireguard-openbsd-161d8759a3f67018ee76b8dc092e33cf787ad7a8.zip
keep ignoring HUP after fork+exec; ok djm
-rw-r--r--usr.bin/ssh/sshd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 38c573017b6..66a12857602 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.558 2020/07/03 10:10:17 markus Exp $ */
+/* $OpenBSD: sshd.c,v 1.559 2020/07/03 10:11:33 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1964,6 +1964,7 @@ main(int ac, char **av)
dup2(config_s[1], REEXEC_CONFIG_PASS_FD);
close(config_s[1]);
+ ssh_signal(SIGHUP, SIG_IGN); /* avoid reset to SIG_DFL */
execv(rexec_argv[0], rexec_argv);
/* Reexec has failed, fall back and continue */