summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/channels.h
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2005-10-10 10:23:08 +0000
committerdjm <djm@openbsd.org>2005-10-10 10:23:08 +0000
commitb693d36b7a63cfe301404fbcee25b72d5f2d5b41 (patch)
treee464ec369c434315dfd4f5159e67a23b6d27977c /usr.bin/ssh/channels.h
parentReflect reality. Xr package 5, and remove all the text that used to apply (diff)
downloadwireguard-openbsd-b693d36b7a63cfe301404fbcee25b72d5f2d5b41.tar.xz
wireguard-openbsd-b693d36b7a63cfe301404fbcee25b72d5f2d5b41.zip
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 'usr.bin/ssh/channels.h')
-rw-r--r--usr.bin/ssh/channels.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 27e760858c7..cd882b46f34 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/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>
@@ -105,8 +105,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;
@@ -162,7 +163,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);