- (djm) Sync with OpenBSD:

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index 7400a17a607ddf8d603ad9449fa96f20918aa0f6..bccb9be2f85db6791dfc8ba9ea5cff93c4054bb7 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.35 2000/09/14 20:25:14 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.39 2000/10/27 07:48:22 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -75,6 +75,10 @@ RCSID("$OpenBSD: clientloop.c,v 1.35 2000/09/14 20:25:14 markus Exp $");
 #include "buffer.h"
 #include "bufaux.h"
 
+
+/* import options */
+extern Options options;
+
 /* Flag indicating that stdin should be redirected from /dev/null. */
 extern int stdin_null_flag;
 
@@ -333,7 +337,7 @@ client_check_window_change()
        if (ioctl(fileno(stdin), TIOCGWINSZ, &ws) < 0)
                return;
 
-       debug("client_check_window_change: changed");
+       debug2("client_check_window_change: changed");
 
        if (compat20) {
                channel_request_start(session_ident, "window-change", 0);
@@ -360,8 +364,6 @@ client_check_window_change()
 void
 client_wait_until_can_do_something(fd_set * readset, fd_set * writeset)
 {
-       /*debug("client_wait_until_can_do_something"); */
-
        /* Initialize select masks. */
        FD_ZERO(readset);
        FD_ZERO(writeset);
@@ -480,7 +482,6 @@ client_process_net_input(fd_set * readset)
        if (FD_ISSET(connection_in, readset)) {
                /* Read as much as possible. */
                len = read(connection_in, buf, sizeof(buf));
-/*debug("read connection_in len %d", len); XXX */
                if (len == 0) {
                        /* Received EOF.  The remote host has closed the connection. */
                        snprintf(buf, sizeof buf, "Connection to %.300s closed by remote host.\r\n",
@@ -771,7 +772,7 @@ client_process_output(fd_set * writeset)
 void
 client_process_buffered_input_packets()
 {
-       dispatch_run(DISPATCH_NONBLOCK, &quit_pending);
+       dispatch_run(DISPATCH_NONBLOCK, &quit_pending, NULL);
 }
 
 /* scan buf[] for '~' before sending data to the peer */
@@ -793,7 +794,6 @@ simple_escape_filter(Channel *c, char *buf, int len)
 int
 client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 {
-       extern Options options;
        double start_time, total_time;
        int len;
        char buf[100];
@@ -852,7 +852,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                client_process_buffered_input_packets();
 
                if (compat20 && !channel_still_open()) {
-                       debug("!channel_still_open.");
+                       debug2("!channel_still_open.");
                        break;
                }
 
@@ -978,7 +978,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 /*********/
 
 void
-client_input_stdout_data(int type, int plen)
+client_input_stdout_data(int type, int plen, void *ctxt)
 {
        unsigned int data_len;
        char *data = packet_get_string(&data_len);
@@ -989,7 +989,7 @@ client_input_stdout_data(int type, int plen)
        xfree(data);
 }
 void
-client_input_stderr_data(int type, int plen)
+client_input_stderr_data(int type, int plen, void *ctxt)
 {
        unsigned int data_len;
        char *data = packet_get_string(&data_len);
@@ -1000,7 +1000,7 @@ client_input_stderr_data(int type, int plen)
        xfree(data);
 }
 void
-client_input_exit_status(int type, int plen)
+client_input_exit_status(int type, int plen, void *ctxt)
 {
        packet_integrity_check(plen, 4, type);
        exit_status = packet_get_int();
@@ -1018,7 +1018,7 @@ client_input_exit_status(int type, int plen)
 
 /* XXXX move to generic input handler */
 void
-client_input_channel_open(int type, int plen)
+client_input_channel_open(int type, int plen, void *ctxt)
 {
        Channel *c = NULL;
        char *ctype;
@@ -1036,13 +1036,13 @@ client_input_channel_open(int type, int plen)
        debug("client_input_channel_open: ctype %s rchan %d win %d max %d",
            ctype, rchan, rwindow, rmaxpack);
 
-       if (strcmp(ctype, "x11") == 0) {
+       if (strcmp(ctype, "x11") == 0 && options.forward_x11) {
                int sock;
                char *originator;
                int originator_port;
                originator = packet_get_string(NULL);
                if (datafellows & SSH_BUG_X11FWD) {
-                       debug("buggy server: x11 request w/o originator_port");
+                       debug2("buggy server: x11 request w/o originator_port");
                        originator_port = 0;
                } else {
                        originator_port = packet_get_int();
@@ -1055,7 +1055,7 @@ client_input_channel_open(int type, int plen)
                if (sock >= 0) {
                        id = channel_new("x11", SSH_CHANNEL_X11_OPEN,
                            sock, sock, -1, CHAN_X11_WINDOW_DEFAULT,
-                           CHAN_X11_PACKET_DEFAULT, 0, xstrdup("x11"));
+                           CHAN_X11_PACKET_DEFAULT, 0, xstrdup("x11"), 1);
                        c = channel_lookup(id);
                }
        }
@@ -1108,11 +1108,14 @@ client_init_dispatch_13()
        dispatch_set(SSH_MSG_CHANNEL_OPEN_CONFIRMATION, &channel_input_open_confirmation);
        dispatch_set(SSH_MSG_CHANNEL_OPEN_FAILURE, &channel_input_open_failure);
        dispatch_set(SSH_MSG_PORT_OPEN, &channel_input_port_open);
-       dispatch_set(SSH_SMSG_AGENT_OPEN, &auth_input_open_request);
        dispatch_set(SSH_SMSG_EXITSTATUS, &client_input_exit_status);
        dispatch_set(SSH_SMSG_STDERR_DATA, &client_input_stderr_data);
        dispatch_set(SSH_SMSG_STDOUT_DATA, &client_input_stdout_data);
-       dispatch_set(SSH_SMSG_X11_OPEN, &x11_input_open);
+
+       dispatch_set(SSH_SMSG_AGENT_OPEN, options.forward_agent ?
+           &auth_input_open_request : &deny_input_open);
+       dispatch_set(SSH_SMSG_X11_OPEN, options.forward_x11 ?
+           &x11_input_open : &deny_input_open);
 }
 void
 client_init_dispatch_15()
@@ -1172,7 +1175,7 @@ client_input_channel_req(int id, void *arg)
 void
 client_set_session_ident(int id)
 {
-       debug("client_set_session_ident: id %d", id);
+       debug2("client_set_session_ident: id %d", id);
        session_ident = id;
        channel_register_callback(id, SSH2_MSG_CHANNEL_REQUEST,
            client_input_channel_req, (void *)0);