summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-07-03 10:11:33 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:06:44 +1000
commitcd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3 (patch)
treec3edc79a85f1b88f2d45b008c8e02886d9627419 /sshd.c
parent8af4a743693ccbea3e15fc9e93edbeb610fa94f4 (diff)
downloadopenssh-git-cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3.tar.gz
upstream: keep ignoring HUP after fork+exec; ok djm
OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index 85229ac8..ba01b1da 100644
--- a/sshd.c
+++ b/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
@@ -2108,6 +2108,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 */