Merged latest OpenBSD changes:

[openssh.git] / channels.c

diff --git a/channels.c b/channels.c
index 8ffe8816a532fddac9bb2af19a3d0ef5de681b8c..891d6030987730fdda4c1f23ff6c5fd735bee21c 100644 (file)
--- a/channels.c
+++ b/channels.c
@@ -155,7 +155,6 @@ int channel_allocate(int type, int sock, char *remote_name)
   chan_init_iostates(c);
   c->self = found;
   c->type = type;
-  c->x11 = 0;
   c->sock = sock;
   c->remote_id = -1;
   c->remote_name = remote_name;
@@ -316,8 +315,6 @@ void channel_prepare_select(fd_set *readset, fd_set *writeset)
 
          /* Start normal processing for the channel. */
          ch->type = SSH_CHANNEL_OPEN;
-         /* Enable X11 Problem FIX */
-         ch->x11 = 1;
          goto redo;
          
        reject: