Merge 4.3p2 to the trunk.

1 files changed, 30 insertions, 28 deletions

diff --git a/session.c b/session.c
index fb719d42a..daad03929 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.186 2005/07/25 11:59:40 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.191 2005/12/24 02:27:41 djm Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -211,15 +211,6 @@ do_authenticated(Authctxt *authctxt)
 {
         setproctitle("%s", authctxt->pw->pw_name);
 
-        /*
-         * Cancel the alarm we set to limit the time taken for
-         * authentication.
-         */
-        alarm(0);
-        if (startup_pipe != -1) {
-                close(startup_pipe);
-                startup_pipe = -1;
-        }
         /* setup the channel layer */
         if (!no_port_forwarding_flag && options.allow_tcp_forwarding)
                 channel_permit_all_opens();
@@ -1423,7 +1414,7 @@ child_close_fds(void)
         endpwent();
 
         /*
-         * Close any extra open file descriptors so that we don\'t have them
+         * Close any extra open file descriptors so that we don't have them
          * hanging around in clients.  Note that we want to do this after
          * initgroups, because at least on Solaris 2.3 it leaves file
          * descriptors open.
@@ -1475,7 +1466,9 @@ do_child(Session *s, const char *command)
                 if (!check_quietlogin(s, command))
                         do_motd();
 #else /* HAVE_OSF_SIA */
-                do_nologin(pw);
+                /* When PAM is enabled we rely on it to do the nologin check */
+                if (!options.use_pam)
+                        do_nologin(pw);
                 do_setusercontext(pw);
                 /*
                  * PAM session modules in do_setusercontext may have
@@ -1556,7 +1549,7 @@ do_child(Session *s, const char *command)
         }
 #endif
 
-        /* Change current directory to the user\'s home directory. */
+        /* Change current directory to the user's home directory. */
         if (chdir(pw->pw_dir) < 0) {
                 fprintf(stderr, "Could not chdir to home directory %s: %s\n",
                     pw->pw_dir, strerror(errno));
@@ -1871,7 +1864,7 @@ session_x11_req(Session *s)
 
         if (s->auth_proto != NULL || s->auth_data != NULL) {
                 error("session_x11_req: session %d: "
-                    "x11 fowarding already active", s->self);
+                    "x11 forwarding already active", s->self);
                 return 0;
         }
         s->single_connection = packet_get_char();
@@ -2103,7 +2096,7 @@ session_close_x11(int id)
 {
         Channel *c;
 
-        if ((c = channel_lookup(id)) == NULL) {
+        if ((c = channel_by_id(id)) == NULL) {
                 debug("session_close_x11: x11 channel %d missing", id);
         } else {
                 /* Detach X11 listener */
@@ -2158,7 +2151,6 @@ static void
 session_exit_message(Session *s, int status)
 {
         Channel *c;
-        u_int i;
 
         if ((c = channel_lookup(s->chanid)) == NULL)
                 fatal("session_exit_message: session %d: no channel %d",
@@ -2188,7 +2180,14 @@ session_exit_message(Session *s, int status)
 
         /* disconnect channel */
         debug("session_exit_message: release channel %d", s->chanid);
-        channel_cancel_cleanup(s->chanid);
+
+        /*
+         * Adjust cleanup callback attachment to send close messages when
+         * the channel gets EOF. The session will be then be closed 
+         * by session_close_by_channel when the childs close their fds.
+         */
+        channel_register_cleanup(c->self, session_close_by_channel, 1);
+
         /*
          * emulate a write failure with 'chan_write_failed', nobody will be
          * interested in data we write.
@@ -2197,15 +2196,6 @@ session_exit_message(Session *s, int status)
          */
         if (c->ostate != CHAN_OUTPUT_CLOSED)
                 chan_write_failed(c);
-        s->chanid = -1;
-
-        /* Close any X11 listeners associated with this session */
-        if (s->x11_chanids != NULL) {
-                for (i = 0; s->x11_chanids[i] != -1; i++) {
-                        session_close_x11(s->x11_chanids[i]);
-                        s->x11_chanids[i] = -1;
-                }
-        }
 }
 
 void
@@ -2249,7 +2239,9 @@ session_close_by_pid(pid_t pid, int status)
         }
         if (s->chanid != -1)
                 session_exit_message(s, status);
-        session_close(s);
+        if (s->ttyfd != -1)
+                session_pty_cleanup(s);
+        s->pid = 0;
 }
 
 /*
@@ -2260,6 +2252,7 @@ void
 session_close_by_channel(int id, void *arg)
 {
         Session *s = session_by_channel(id);
+        u_int i;
 
         if (s == NULL) {
                 debug("session_close_by_channel: no session for id %d", id);
@@ -2279,6 +2272,15 @@ session_close_by_channel(int id, void *arg)
         }
         /* detach by removing callback */
         channel_cancel_cleanup(s->chanid);
+
+        /* Close any X11 listeners associated with this session */
+        if (s->x11_chanids != NULL) {
+                for (i = 0; s->x11_chanids[i] != -1; i++) {
+                        session_close_x11(s->x11_chanids[i]);
+                        s->x11_chanids[i] = -1;
+                }
+        }
+
         s->chanid = -1;
         session_close(s);
 }
@@ -2373,7 +2375,7 @@ session_setup_x11fwd(Session *s)
         }
         for (i = 0; s->x11_chanids[i] != -1; i++) {
                 channel_register_cleanup(s->x11_chanids[i],
-                    session_close_single_x11);
+                    session_close_single_x11, 0);
         }
 
         /* Set up a suitable value for the DISPLAY variable. */