diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-10 15:19:44 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-10 15:19:44 +0000 |
| commit | 8318ac763c4be510b3356d6efa45e67f6207fa83 (patch) | |
| tree | 57cee71437bc9e63d93593a09b42ede6350263de | |
| parent | 7938b2ded14e1c88c63eb847fc4c5fc337facb63 (diff) | |
repair x11-fwd
| -rw-r--r-- | usr.bin/ssh/channels.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |