- 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@

diff --git a/ChangeLog b/ChangeLog
index 667e28fdf5661e7b1cc205c5cec65c1c0a24d74f..fb846df8fbeccb4a2dc16fce806c6edb66c5ab27 100644 (file)
--- 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

diff --git a/sshd.c b/sshd.c
index 60f63ef7b7011ccf848d261bba523ab316014e91..2a28ece035ca2d3a2038a683929b21c00b790df7 100644 (file)
--- 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 <openssl/dh.h>
 #include <openssl/bn.h>
@@ -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;
                                        }
                                }