summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sshd.c7
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 @@
19 - markus@cvs.openbsd.org 2004/08/26 16:00:55 19 - markus@cvs.openbsd.org 2004/08/26 16:00:55
20 [ssh.1 sshd.8] 20 [ssh.1 sshd.8]
21 get rid of references to rhosts authentication; with jmc@ 21 get rid of references to rhosts authentication; with jmc@
22 - djm@cvs.openbsd.org 2004/08/28 01:01:48
23 [sshd.c]
24 don't erroneously close stdin for !reexec case, from Dave Johnson;
25 ok markus@
22 26
2320040828 2720040828
24 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from 28 - (dtucker) [openbsd-compat/mktemp.c] Remove superfluous Cygwin #ifdef; from
@@ -1686,4 +1690,4 @@
1686 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1690 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1687 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1691 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1688 1692
1689$Id: ChangeLog,v 1.3527 2004/08/29 06:37:24 dtucker Exp $ 1693$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 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.301 2004/08/11 11:50:09 dtucker Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.302 2004/08/28 01:01:48 djm Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -884,7 +884,7 @@ main(int ac, char **av)
884 char ntop[NI_MAXHOST], strport[NI_MAXSERV]; 884 char ntop[NI_MAXHOST], strport[NI_MAXSERV];
885 char *line; 885 char *line;
886 int listen_sock, maxfd; 886 int listen_sock, maxfd;
887 int startup_p[2], config_s[2]; 887 int startup_p[2] = { -1 , -1 }, config_s[2] = { -1 , -1 };
888 int startups = 0; 888 int startups = 0;
889 Key *key; 889 Key *key;
890 Authctxt *authctxt; 890 Authctxt *authctxt;
@@ -1507,7 +1507,8 @@ main(int ac, char **av)
1507 sock_in = newsock; 1507 sock_in = newsock;
1508 sock_out = newsock; 1508 sock_out = newsock;
1509 log_init(__progname, options.log_level, options.log_facility, log_stderr); 1509 log_init(__progname, options.log_level, options.log_facility, log_stderr);
1510 close(config_s[0]); 1510 if (rexec_flag)
1511 close(config_s[0]);
1511 break; 1512 break;
1512 } 1513 }
1513 } 1514 }