From 0f56ed16b8e463e16c3a8f78544943a9e6f8ea1f Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 29 Aug 2004 16:38:41 +1000 Subject: - djm@cvs.openbsd.org 2004/08/28 01:01:48 [sshd.c] don't erroneously close stdin for !reexec case, from Dave Johnson; ok markus@ --- ChangeLog | 6 +++++- sshd.c | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 08f910264..844fdfdbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,10 @@ - markus@cvs.openbsd.org 2004/08/26 16:00:55 [ssh.1 sshd.8] get rid of references to rhosts authentication; with jmc@ + - djm@cvs.openbsd.org 2004/08/28 01:01:48 + [sshd.c] + don't erroneously close stdin for !reexec case, from Dave Johnson; + ok markus@ 20040828 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from @@ -1686,4 +1690,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3527 2004/08/29 06:37:24 dtucker Exp $ +$Id: ChangeLog,v 1.3528 2004/08/29 06:38:41 dtucker Exp $ diff --git a/sshd.c b/sshd.c index 60f63ef7b..2a28ece03 100644 --- a/sshd.c +++ b/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.301 2004/08/11 11:50:09 dtucker Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.302 2004/08/28 01:01:48 djm Exp $"); #include #include @@ -884,7 +884,7 @@ main(int ac, char **av) char ntop[NI_MAXHOST], strport[NI_MAXSERV]; char *line; int listen_sock, maxfd; - int startup_p[2], config_s[2]; + int startup_p[2] = { -1 , -1 }, config_s[2] = { -1 , -1 }; int startups = 0; Key *key; Authctxt *authctxt; @@ -1507,7 +1507,8 @@ main(int ac, char **av) sock_in = newsock; sock_out = newsock; log_init(__progname, options.log_level, options.log_facility, log_stderr); - close(config_s[0]); + if (rexec_flag) + close(config_s[0]); break; } } -- cgit v1.2.3