From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 3 Jul 2020 10:11:33 +0000 (+0000)
Subject: upstream: keep ignoring HUP after fork+exec; ok djm
X-Git-Tag: V_8_4_P1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3;p=thirdparty%2Fopenssh-portable.git

upstream: keep ignoring HUP after fork+exec; ok djm

OpenBSD-Commit-ID: 7679985a84ee5ceb09839905bb6f3ddd568749a2
---

diff --git a/sshd.c b/sshd.c
index 85229ac80..ba01b1da7 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 */