]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: unbreak "sshd -ddd" - close of config passing fd happened too
authordjm@openbsd.org <djm@openbsd.org>
Fri, 5 Jun 2020 06:18:07 +0000 (06:18 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 5 Jun 2020 06:20:09 +0000 (16:20 +1000)
early. ok markus@

OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0

sshd.c

diff --git a/sshd.c b/sshd.c
index 0f8ddebe5153b3088b33880dd0348dffc39fabcb..71f743a0dccfcab863b811075ae8fa3aca3d9db6 100644 (file)
--- 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]);
                                }