- (djm) OpenBSD CVS Updates:

   - deraadt@cvs.openbsd.org 2000/07/11 02:11:34
     [session.c sshd.c ]
     make MaxStartups code still work with -d; djm
   - deraadt@cvs.openbsd.org 2000/07/11 13:17:45
     [readconf.c ssh_config]
     disable FallBackToRsh by default

1 files changed, 7 insertions, 3 deletions

diff --git a/session.c b/session.c
index abf3ef346..3e889dbf1 100644
--- a/session.c
+++ b/session.c
@@ -8,7 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.22 2000/07/05 20:18:07 deraadt Exp $");
+RCSID("$OpenBSD: session.c,v 1.23 2000/07/11 08:11:33 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -169,8 +169,10 @@ do_authenticated(struct passwd * pw)
          * authentication.
          */
         alarm(0);
-        if (startup_pipe != -1)
+        if (startup_pipe != -1) {
                 close(startup_pipe);
+                startup_pipe = -1;
+        }
 
         /*
          * Inform the channel mechanism that we are the server side and that
@@ -1793,8 +1795,10 @@ do_authenticated2(void)
          * authentication.
          */
         alarm(0);
-        if (startup_pipe != -1)
+        if (startup_pipe != -1) {
                 close(startup_pipe);
+                startup_pipe = -1;
+        }
         server_loop2();
         if (xauthfile)
                 xauthfile_cleanup_proc(NULL);