repair x11-fwd
authormarkus <markus@openbsd.org>
Mon, 10 Apr 2000 15:19:43 +0000 (15:19 +0000)
committermarkus <markus@openbsd.org>
Mon, 10 Apr 2000 15:19:43 +0000 (15:19 +0000)
usr.bin/ssh/channels.c

index 9fa3b22..c32999a 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: channels.c,v 1.46 2000/04/06 09:43:15 markus Exp $");
+RCSID("$Id: channels.c,v 1.47 2000/04/10 15:19:43 markus Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -437,6 +437,7 @@ channel_pre_x11_open_13(Channel *c, fd_set * readset, fd_set * writeset)
        if (ret == 1) {
                /* Start normal processing for the channel. */
                c->type = SSH_CHANNEL_OPEN;
+               channel_pre_open_13(c, readset, writeset);
        } else if (ret == -1) {
                /*
                 * We have received an X11 connection that has bad
@@ -460,6 +461,7 @@ channel_pre_x11_open_15(Channel *c, fd_set * readset, fd_set * writeset)
        int ret = x11_open_helper(c);
        if (ret == 1) {
                c->type = SSH_CHANNEL_OPEN;
+               channel_pre_open_15(c, readset, writeset);
        } else if (ret == -1) {
                debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
                chan_read_failed(c);