diff options
author | Damien Miller <djm@mindrot.org> | 2005-11-05 14:52:50 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-11-05 14:52:50 +1100 |
commit | 39eda6eb6a8364e8df6779e71e0b434eaae3edd5 (patch) | |
tree | 2e7a8fda98f3a3d9b4e14f2b36787fc2168b691a /channels.h | |
parent | 3f54a9f5b7978e8e7085f86722bc2704f7fab2e2 (diff) |
- djm@cvs.openbsd.org 2005/10/10 10:23:08
[channels.c channels.h clientloop.c serverloop.c session.c]
fix regression I introduced in 4.2: X11 forwardings initiated after
a session has exited (e.g. "(sleep 5; xterm) &") would not start.
bz #1086 reported by t8m AT centrum.cz; ok markus@ dtucker@
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/channels.h b/channels.h index 1cb2c3a34..7e1cc7c5a 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.79 2005/07/17 06:49:04 djm Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.80 2005/10/10 10:23:08 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -106,8 +106,9 @@ struct Channel { | |||
106 | 106 | ||
107 | /* callback */ | 107 | /* callback */ |
108 | channel_callback_fn *confirm; | 108 | channel_callback_fn *confirm; |
109 | channel_callback_fn *detach_user; | ||
110 | void *confirm_ctx; | 109 | void *confirm_ctx; |
110 | channel_callback_fn *detach_user; | ||
111 | int detach_close; | ||
111 | 112 | ||
112 | /* filter */ | 113 | /* filter */ |
113 | channel_filter_fn *input_filter; | 114 | channel_filter_fn *input_filter; |
@@ -163,7 +164,7 @@ void channel_stop_listening(void); | |||
163 | 164 | ||
164 | void channel_send_open(int); | 165 | void channel_send_open(int); |
165 | void channel_request_start(int, char *, int); | 166 | void channel_request_start(int, char *, int); |
166 | void channel_register_cleanup(int, channel_callback_fn *); | 167 | void channel_register_cleanup(int, channel_callback_fn *, int); |
167 | void channel_register_confirm(int, channel_callback_fn *, void *); | 168 | void channel_register_confirm(int, channel_callback_fn *, void *); |
168 | void channel_register_filter(int, channel_filter_fn *); | 169 | void channel_register_filter(int, channel_filter_fn *); |
169 | void channel_cancel_cleanup(int); | 170 | void channel_cancel_cleanup(int); |