summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/channels.c b/channels.c
index c140b77dc..957b4a428 100644
--- a/channels.c
+++ b/channels.c
@@ -17,7 +17,7 @@
17 */ 17 */
18 18
19#include "includes.h" 19#include "includes.h"
20RCSID("$Id: channels.c,v 1.23 2000/04/12 08:45:06 damien Exp $"); 20RCSID("$Id: channels.c,v 1.24 2000/04/12 10:17:38 damien Exp $");
21 21
22#include "ssh.h" 22#include "ssh.h"
23#include "packet.h" 23#include "packet.h"
@@ -437,6 +437,7 @@ channel_pre_x11_open_13(Channel *c, fd_set * readset, fd_set * writeset)
437 if (ret == 1) { 437 if (ret == 1) {
438 /* Start normal processing for the channel. */ 438 /* Start normal processing for the channel. */
439 c->type = SSH_CHANNEL_OPEN; 439 c->type = SSH_CHANNEL_OPEN;
440 channel_pre_open_13(c, readset, writeset);
440 } else if (ret == -1) { 441 } else if (ret == -1) {
441 /* 442 /*
442 * We have received an X11 connection that has bad 443 * 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)
460 int ret = x11_open_helper(c); 461 int ret = x11_open_helper(c);
461 if (ret == 1) { 462 if (ret == 1) {
462 c->type = SSH_CHANNEL_OPEN; 463 c->type = SSH_CHANNEL_OPEN;
464 channel_pre_open_15(c, readset, writeset);
463 } else if (ret == -1) { 465 } else if (ret == -1) {
464 debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate); 466 debug("X11 rejected %d i%d/o%d", c->self, c->istate, c->ostate);
465 chan_read_failed(c); 467 chan_read_failed(c);