summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-10-30 11:39:56 +1000
committerDamien Miller <djm@mindrot.org>1999-10-30 11:39:56 +1000
commit1e4772c32c109e6c69291335ad49350e7762785d (patch)
tree1a9224ff01d028a4b9f12a477ccf447624fca96f /channels.c
parent5ffa64478a963426a1ab92a7b74b87d3ae79ba53 (diff)
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
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/channels.c b/channels.c
index 29a842fc..79a02c88 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: