Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / serverloop.c

diff --git a/openssh/serverloop.c b/openssh/serverloop.c
index bc7cd656afd8e9bac1e44684265685d2d2de1a40..a953902736a69df0f602dc9e04c73cfd53ee1b7e 100644 (file)
--- a/openssh/serverloop.c
+++ b/openssh/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.114 2003/12/09 15:28:43 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.110 2003/06/24 08:23:46 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -60,7 +60,7 @@ extern ServerOptions options;
 
 /* XXX */
 extern Kex *xxx_kex;
-extern Authctxt *the_authctxt;
+static Authctxt *xxx_authctxt;
 
 static Buffer stdin_buffer;    /* Buffer for stdin data. */
 static Buffer stdout_buffer;   /* Buffer for stdout data. */
@@ -212,23 +212,26 @@ make_packets_from_stdout_data(void)
 static void
 client_alive_check(void)
 {
-       int channel_id;
+       static int had_channel = 0;
+       int id;
+
+       id = channel_find_open();
+       if (id == -1) {
+               if (!had_channel)
+                       return;
+               packet_disconnect("No open channels after timeout!");
+       }
+       had_channel = 1;
 
        /* timeout, check to see how many we have had */
        if (++client_alive_timeouts > options.client_alive_count_max)
                packet_disconnect("Timeout, your session not responding.");
 
        /*
-        * send a bogus global/channel request with "wantreply",
+        * send a bogus channel request with "wantreply",
         * we should get back a failure
         */
-       if ((channel_id = channel_find_open()) == -1) {
-               packet_start(SSH2_MSG_GLOBAL_REQUEST);
-               packet_put_cstring("keepalive@openssh.com");
-               packet_put_char(1);     /* boolean: want reply */
-       } else {
-               channel_request_start(channel_id, "keepalive@openssh.com", 1);
-       }
+       channel_request_start(id, "keepalive@openssh.com", 1);
        packet_send();
 }
 
@@ -352,13 +355,13 @@ process_input(fd_set * readset)
                        connection_closed = 1;
                        if (compat20)
                                return;
-                       cleanup_exit(255);
+                       fatal_cleanup();
                } else if (len < 0) {
                        if (errno != EINTR && errno != EAGAIN) {
                                verbose("Read error from remote host "
                                    "%.100s: %.100s",
                                    get_remote_ipaddr(), strerror(errno));
-                               cleanup_exit(255);
+                               fatal_cleanup();
                        }
                } else {
                        /* Buffer any received data. */
@@ -753,6 +756,8 @@ server_loop2(Authctxt *authctxt)
        max_fd = MAX(connection_in, connection_out);
        max_fd = MAX(max_fd, notify_pipe[0]);
 
+       xxx_authctxt = authctxt;
+
        server_init_dispatch();
 
        for (;;) {
@@ -794,9 +799,9 @@ server_loop2(Authctxt *authctxt)
 }
 
 static void
-server_input_keep_alive(int type, u_int32_t seq, void *ctxt)
+server_input_channel_failure(int type, u_int32_t seq, void *ctxt)
 {
-       debug("Got %d/%u for keepalive", type, seq);
+       debug("Got CHANNEL_FAILURE for keepalive");
        /*
         * reset timeout, since we got a sane answer from the client.
         * even if this was generated by something other than
@@ -805,6 +810,7 @@ server_input_keep_alive(int type, u_int32_t seq, void *ctxt)
        client_alive_timeouts = 0;
 }
 
+
 static void
 server_input_stdin_data(int type, u_int32_t seq, void *ctxt)
 {
@@ -894,7 +900,7 @@ server_request_session(char *ctype)
        c = channel_new(ctype, SSH_CHANNEL_LARVAL,
            -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT,
            0, "server-session", 1);
-       if (session_open(the_authctxt, c->self) != 1) {
+       if (session_open(xxx_authctxt, c->self) != 1) {
                debug("session open failed, free channel %d", c->self);
                channel_free(c);
                return NULL;
@@ -968,9 +974,9 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
                char *listen_address;
                u_short listen_port;
 
-               pw = the_authctxt->pw;
-               if (pw == NULL || !the_authctxt->valid)
-                       fatal("server_input_global_request: no/invalid user");
+               pw = auth_get_user();
+               if (pw == NULL)
+                       fatal("server_input_global_request: no user");
                listen_address = packet_get_string(NULL);
                listen_port = (u_short)packet_get_int();
                debug("server_input_global_request: tcpip-forward listen %s port %d",
@@ -1044,9 +1050,7 @@ server_init_dispatch_20(void)
        dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust);
        dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request);
        /* client_alive */
-       dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive);
-       dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive);
-       dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive);
+       dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_channel_failure);
        /* rekeying */
        dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
 }