- (djm) Fix problem with debug mode and MaxStartups

diff --git a/ChangeLog b/ChangeLog
index 8481359a72bf02375882c486a5b2464870d33be2..b36f9a48d08ba13637a0afacabe209b71b9413f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
    - ho@cvs.openbsd.org      2000/07/10 10:30:25
      [cipher.c kex.c servconf.c]
      strtok() --> strsep(). (niels@ ok)
+ - (djm) Fix problem with debug mode and MaxStartups
 
 20000709
  - (djm) Only enable PAM_TTY kludge for Linux. Problem report from

diff --git a/session.c b/session.c
index 96a2d3b52fa0cd826845a29741d90a7399389598..abf3ef3461ae6274533c645f3e676c7ab2b595aa 100644 (file)
--- a/session.c
+++ b/session.c
@@ -169,7 +169,8 @@ do_authenticated(struct passwd * pw)
         * authentication.
         */
        alarm(0);
-       close(startup_pipe);
+       if (startup_pipe != -1)
+               close(startup_pipe);
 
        /*
         * Inform the channel mechanism that we are the server side and that
@@ -1792,7 +1793,8 @@ do_authenticated2(void)
         * authentication.
         */
        alarm(0);
-       close(startup_pipe);
+       if (startup_pipe != -1)
+               close(startup_pipe);
        server_loop2();
        if (xauthfile)
                xauthfile_cleanup_proc(NULL);

diff --git a/sshd.c b/sshd.c
index fc8b17b9e8877496946dc7115395ad80ac855349..e53629d4bf15503a83f6afc3e95a3576920f1645 100644 (file)
--- a/sshd.c
+++ b/sshd.c
@@ -855,6 +855,7 @@ main(int ac, char **av)
                                        sock_in = newsock;
                                        sock_out = newsock;
                                        pid = getpid();
+                                       startup_pipe = -1;
                                        break;
                                } else {
                                        /*