mirror of git://anongit.mindrot.org/openssh.git
upstream: unbreak "sshd -ddd" - close of config passing fd happened too
early. ok markus@ OpenBSD-Commit-ID: 49346e945c6447aca3e904e65fc400128d2f8ed0
This commit is contained in:
parent
3de02be39e
commit
3a7f654d5b
3
sshd.c
3
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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;
|
startup_pipe = -1;
|
||||||
pid = getpid();
|
pid = getpid();
|
||||||
if (rexec_flag) {
|
if (rexec_flag) {
|
||||||
close(config_s[1]);
|
|
||||||
send_rexec_state(config_s[0], cfg);
|
send_rexec_state(config_s[0], cfg);
|
||||||
close(config_s[0]);
|
close(config_s[0]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue