summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2020-06-05 06:18:08 +0000
committerDamien Miller <djm@cvs.openbsd.org>2020-06-05 06:18:08 +0000
commitfaf5215f887b8e0980a8106f934ca771445dd730 (patch)
tree2950e15ad4235fd999e513ce1524464bf23f2921 /usr.bin
parent7cb12d59035f9b22505a73cd45653888e583e010 (diff)
unbreak "sshd -ddd" - close of config passing fd happened too early.
ok markus@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sshd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index 5114c9a68a4..68451bfcae8 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/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
@@ -1256,7 +1256,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]);
}