summaryrefslogtreecommitdiff
path: root/channels.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 14:52:50 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 14:52:50 +1100
commit39eda6eb6a8364e8df6779e71e0b434eaae3edd5 (patch)
tree2e7a8fda98f3a3d9b4e14f2b36787fc2168b691a /channels.h
parent3f54a9f5b7978e8e7085f86722bc2704f7fab2e2 (diff)
downloadopenssh-git-39eda6eb6a8364e8df6779e71e0b434eaae3edd5.tar.gz
- 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.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/channels.h b/channels.h
index 1cb2c3a3..7e1cc7c5 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.79 2005/07/17 06:49:04 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.80 2005/10/10 10:23:08 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -106,8 +106,9 @@ struct Channel {
/* callback */
channel_callback_fn *confirm;
- channel_callback_fn *detach_user;
void *confirm_ctx;
+ channel_callback_fn *detach_user;
+ int detach_close;
/* filter */
channel_filter_fn *input_filter;
@@ -163,7 +164,7 @@ void channel_stop_listening(void);
void channel_send_open(int);
void channel_request_start(int, char *, int);
-void channel_register_cleanup(int, channel_callback_fn *);
+void channel_register_cleanup(int, channel_callback_fn *, int);
void channel_register_confirm(int, channel_callback_fn *, void *);
void channel_register_filter(int, channel_filter_fn *);
void channel_cancel_cleanup(int);