summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-06-05 06:18:07 +0000
committerDamien Miller <djm@mindrot.org>2020-06-05 16:20:09 +1000
commit3a7f654d5bcb20df24a134b6581b0d235da4564a (patch)
tree004e59a23dae1d2990213878935cd2c6748ca57b /sshd.c
parent3de02be39e5c0c2208d9682a3844991651620fcc (diff)
upstream: unbreak "sshd -ddd" - close of config passing fd happened too
early. ok markus@ OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index 0f8ddebe5..71f743a0d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.555 2020/05/26 01:09:05 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.556 2020/06/05 06:18:07 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * 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)
1310 startup_pipe = -1; 1310 startup_pipe = -1;
1311 pid = getpid(); 1311 pid = getpid();
1312 if (rexec_flag) { 1312 if (rexec_flag) {
1313 close(config_s[1]);
1314 send_rexec_state(config_s[0], cfg); 1313 send_rexec_state(config_s[0], cfg);
1315 close(config_s[0]); 1314 close(config_s[0]);
1316 } 1315 }