- (djm) OpenBSD CVS updates:

   - markus@cvs.openbsd.org  2000/06/26 03:22:29
     [authfd.c]
     cleanup, less cut&paste
   - markus@cvs.openbsd.org  2000/06/26 15:59:19
     [servconf.c servconf.h session.c sshd.8 sshd.c]
     MaxStartups: limit number of unauthenticated connections, work by
     theo and me
   - deraadt@cvs.openbsd.org 2000/07/05 14:18:07
     [session.c]
     use no_x11_forwarding_flag correctly; provos ok
   - provos@cvs.openbsd.org  2000/07/05 15:35:57
     [sshd.c]
     typo
   - aaron@cvs.openbsd.org   2000/07/05 22:06:58
     [scp.1 ssh-agent.1 ssh-keygen.1 sshd.8]
     Insert more missing .El directives. Our troff really should identify
     these and spit out a warning.
   - todd@cvs.openbsd.org    2000/07/06 21:55:04
     [auth-rsa.c auth2.c ssh-keygen.c]
     clean code is good code
   - deraadt@cvs.openbsd.org 2000/07/07 02:14:29
     [serverloop.c]
     sense of port forwarding flag test was backwards
   - provos@cvs.openbsd.org  2000/07/08 17:17:31
     [compat.c readconf.c]
     replace strtok with strsep; from David Young <dyoung@onthejob.net>
   - deraadt@cvs.openbsd.org 2000/07/08 19:21:15
     [auth.h]
     KNF
   - ho@cvs.openbsd.org      2000/07/08 19:27:33
     [compat.c readconf.c]
     Better conditions for strsep() ending.
   - ho@cvs.openbsd.org      2000/07/10 10:27:05
     [readconf.c]
     Get the correct message on errors. (niels@ ok)
   - ho@cvs.openbsd.org      2000/07/10 10:30:25
     [cipher.c kex.c servconf.c]
     strtok() --> strsep(). (niels@ ok)

1 files changed, 10 insertions, 5 deletions

diff --git a/session.c b/session.c
index 7fe2b47f4..96a2d3b52 100644
--- a/session.c
+++ b/session.c
@@ -8,10 +8,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.20 2000/06/18 04:42:54 markus Exp $");
-#if defined(HAVE_USERSEC_H)
-#include <usersec.h>
-#endif
+RCSID("$OpenBSD: session.c,v 1.22 2000/07/05 20:18:07 deraadt Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -35,6 +32,10 @@ RCSID("$OpenBSD: session.c,v 1.20 2000/06/18 04:42:54 markus Exp $");
 #include <proj.h>
 #endif /* WITH_IRIX_PROJECT */
 
+#if defined(HAVE_USERSEC_H)
+#include <usersec.h>
+#endif
+
 #ifdef HAVE_OSF_SIA
 # include <sia.h>
 # include <siad.h>
@@ -90,6 +91,8 @@ static const char *__progname = "sshd";
 extern int log_stderr;
 extern int debug_flag;
 
+extern int startup_pipe;
+
 /* Local Xauthority file. */
 static char *xauthfile;
 
@@ -166,6 +169,7 @@ do_authenticated(struct passwd * pw)
          * authentication.
          */
         alarm(0);
+        close(startup_pipe);
 
         /*
          * Inform the channel mechanism that we are the server side and that
@@ -1457,7 +1461,7 @@ session_subsystem_req(Session *s)
 int
 session_x11_req(Session *s)
 {
-        if (!no_port_forwarding_flag) {
+        if (no_x11_forwarding_flag) {
                 debug("X11 forwarding disabled in user configuration file.");
                 return 0;
         }
@@ -1788,6 +1792,7 @@ do_authenticated2(void)
          * authentication.
          */
         alarm(0);
+        close(startup_pipe);
         server_loop2();
         if (xauthfile)
                 xauthfile_cleanup_proc(NULL);