From 1e4772c32c109e6c69291335ad49350e7762785d Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 30 Oct 1999 11:39:56 +1000
Subject: Merged latest OpenBSD changes:

nchan.ms -\
channels.[ch] - remove broken x11 fix and document istate/ostate
ssh-agent.c - call setsid() regardless of argv[]
ssh.c - save a few lines when disabling rhosts-{rsa-}auth
---
 channels.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'channels.c')

diff --git a/channels.c b/channels.c
index 29a842fcf..79a02c88b 100644
--- a/channels.c
+++ b/channels.c
@@ -16,7 +16,7 @@ arbitrary tcp/ip connections, and the authentication agent connection.
 */
 
 #include "includes.h"
-RCSID("$Id: channels.c,v 1.2 1999/10/28 05:23:30 damien Exp $");
+RCSID("$Id: channels.c,v 1.3 1999/10/30 01:39:56 damien Exp $");
 
 #include "ssh.h"
 #include "packet.h"
@@ -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:
-- 
cgit v1.2.3