From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 5 Jun 2020 06:18:07 +0000 (+0000)
Subject: upstream: unbreak "sshd -ddd" - close of config passing fd happened too
X-Git-Tag: V_8_4_P1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a7f654d5bcb20df24a134b6581b0d235da4564a;p=thirdparty%2Fopenssh-portable.git

upstream: unbreak "sshd -ddd" - close of config passing fd happened too

early. ok markus@

OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0
---

diff --git a/sshd.c b/sshd.c
index 0f8ddebe5..71f743a0d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.555 2020/05/26 01:09:05 djm Exp $ */
+/* $OpenBSD: sshd.c,v 1.556 2020/06/05 06:18:07 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1310,7 +1310,6 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s)
 				startup_pipe = -1;
 				pid = getpid();
 				if (rexec_flag) {
-					close(config_s[1]);
 					send_rexec_state(config_s[0], cfg);
 					close(config_s[0]);
 				}