tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Darren Tucker 2004-08-29 16:38:41 +10:00
parent db69390817
commit 0f56ed16b8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -19,6 +19,10 @@
- markus@cvs.openbsd.org 2004/08/26 16:00:55 - markus@cvs.openbsd.org 2004/08/26 16:00:55
[ssh.1 sshd.8] [ssh.1 sshd.8]
get rid of references to rhosts authentication; with jmc@ 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 20040828
- (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@ -1686,4 +1690,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

7
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #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 <openssl/dh.h> #include <openssl/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -884,7 +884,7 @@ main(int ac, char **av)
char ntop[NI_MAXHOST], strport[NI_MAXSERV]; char ntop[NI_MAXHOST], strport[NI_MAXSERV];
char *line; char *line;
int listen_sock, maxfd; 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; int startups = 0;
Key *key; Key *key;
Authctxt *authctxt; Authctxt *authctxt;
@ -1507,7 +1507,8 @@ main(int ac, char **av)
sock_in = newsock; sock_in = newsock;
sock_out = newsock; sock_out = newsock;
log_init(__progname, options.log_level, options.log_facility, log_stderr); log_init(__progname, options.log_level, options.log_facility, log_stderr);
close(config_s[0]); if (rexec_flag)
close(config_s[0]);
break; break;
} }
} }