- (djm) fix select hack in serverloop.c from Philippe WILLEM

[openssh.git] / serverloop.c

diff --git a/serverloop.c b/serverloop.c
index c2b2d0222e0a68585b916fba808eeb24123e6203..a9e478764218b8e2e607f44dc1610eebe150d812 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -49,6 +49,8 @@
 #include "dispatch.h"
 #include "auth-options.h"
 
+extern ServerOptions options;
+
 static Buffer stdin_buffer;    /* Buffer for stdin data. */
 static Buffer stdout_buffer;   /* Buffer for stdout data. */
 static Buffer stderr_buffer;   /* Buffer for stderr data. */
@@ -97,9 +99,10 @@ sigchld_handler(int sig)
                        error("Strange, got SIGCHLD and wait returned pid %d but child is %d",
                              wait_pid, child_pid);
                if (WIFEXITED(child_wait_status) ||
-                   WIFSIGNALED(child_wait_status))
+                   WIFSIGNALED(child_wait_status)) {
                        child_terminated = 1;
                        child_has_selected = 0;
+               }
        }
        signal(SIGCHLD, sigchld_handler);
        errno = save_errno;
@@ -389,7 +392,7 @@ drain_output()
 void
 process_buffered_input_packets()
 {
-       dispatch_run(DISPATCH_NONBLOCK, NULL);
+       dispatch_run(DISPATCH_NONBLOCK, NULL, NULL);
 }
 
 /*
@@ -418,6 +421,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
        child_terminated = 0;
        child_has_selected = 0;
        signal(SIGCHLD, sigchld_handler);
+       signal(SIGPIPE, SIG_IGN);
 
        /* Initialize our global variables. */
        fdin = fdin_arg;
@@ -651,6 +655,7 @@ server_loop2(void)
        debug("Entering interactive session for SSH2.");
 
        signal(SIGCHLD, sigchld_handler2);
+       signal(SIGPIPE, SIG_IGN);
        child_terminated = 0;
        connection_in = packet_get_connection_in();
        connection_out = packet_get_connection_out();
@@ -670,15 +675,15 @@ server_loop2(void)
                if (packet_not_very_much_data_to_write())
                        channel_output_poll();
                wait_until_can_do_something(&readset, &writeset, 0);
-               if (child_terminated) {
+               if (child_terminated && child_has_selected) {
+                       /* XXX: race - assumes only one child has terminated */
                        while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
                                session_close_by_pid(pid, status);
                        child_terminated = 0;
+                       child_has_selected = 0;
                        signal(SIGCHLD, sigchld_handler2);
                }
                channel_after_select(&readset, &writeset);
-               if (child_terminated && child_has_selected)
-                       break;
                process_input(&readset);
                process_output(&writeset);
        }
@@ -689,7 +694,7 @@ server_loop2(void)
 }
 
 void
-server_input_stdin_data(int type, int plen)
+server_input_stdin_data(int type, int plen, void *ctxt)
 {
        char *data;
        unsigned int data_len;
@@ -706,7 +711,7 @@ server_input_stdin_data(int type, int plen)
 }
 
 void
-server_input_eof(int type, int plen)
+server_input_eof(int type, int plen, void *ctxt)
 {
        /*
         * Eof from the client.  The stdin descriptor to the
@@ -719,7 +724,7 @@ server_input_eof(int type, int plen)
 }
 
 void
-server_input_window_size(int type, int plen)
+server_input_window_size(int type, int plen, void *ctxt)
 {
        int row = packet_get_int();
        int col = packet_get_int();
@@ -749,7 +754,7 @@ input_direct_tcpip(void)
           originator, originator_port, target, target_port);
 
        /* XXX check permission */
-       if (no_port_forwarding_flag) {
+       if (no_port_forwarding_flag || !options.allow_tcp_forwarding) {
                xfree(target);
                xfree(originator);
                return -1;
@@ -765,7 +770,7 @@ input_direct_tcpip(void)
 }
 
 void
-server_input_channel_open(int type, int plen)
+server_input_channel_open(int type, int plen, void *ctxt)
 {
        Channel *c = NULL;
        char *ctype;
@@ -780,7 +785,7 @@ server_input_channel_open(int type, int plen)
        rwindow = packet_get_int();
        rmaxpack = packet_get_int();
 
-       debug("channel_input_open: ctype %s rchan %d win %d max %d",
+       debug("server_input_channel_open: ctype %s rchan %d win %d max %d",
            ctype, rchan, rwindow, rmaxpack);
 
        if (strcmp(ctype, "session") == 0) {