From: markus <markus@openbsd.org>
Date: Mon, 10 Apr 2000 15:19:43 +0000 (+0000)
Subject: repair x11-fwd
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a4b55a8086765d3f10b8f3051a7e7a78042c15b5;p=openbsd

repair x11-fwd
---

diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 9fa3b22c04d..c32999a0586 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -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);