diff options
author | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2012-09-07 00:20:47 +0100 |
commit | eab78da6a54225de06271d9c8da650f04a55ed88 (patch) | |
tree | aa258ca77515939f6d89317ff67fbcb0bca08b24 /channels.h | |
parent | a26f5de49df59322fde07f7be91b3e3969c9c238 (diff) | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) |
* New upstream release (http://www.openssh.com/txt/release-6.1).
- Enable pre-auth sandboxing by default for new installs.
- Allow "PermitOpen none" to refuse all port-forwarding requests
(closes: #543683).
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/channels.h b/channels.h index c1f01c48b..d75b800f7 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.109 2011/09/23 07:45:05 markus Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.111 2012/04/11 13:16:19 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -105,6 +105,7 @@ struct Channel { | |||
105 | int wfd_isatty; /* wfd is a tty */ | 105 | int wfd_isatty; /* wfd is a tty */ |
106 | int client_tty; /* (client) TTY has been requested */ | 106 | int client_tty; /* (client) TTY has been requested */ |
107 | int force_drain; /* force close on iEOF */ | 107 | int force_drain; /* force close on iEOF */ |
108 | time_t notbefore; /* Pause IO until deadline (time_t) */ | ||
108 | int delayed; /* post-select handlers for newly created | 109 | int delayed; /* post-select handlers for newly created |
109 | * channels are delayed until the first call | 110 | * channels are delayed until the first call |
110 | * to a matching pre-select handler. | 111 | * to a matching pre-select handler. |
@@ -238,7 +239,8 @@ void channel_input_status_confirm(int, u_int32_t, void *); | |||
238 | 239 | ||
239 | /* file descriptor handling (read/write) */ | 240 | /* file descriptor handling (read/write) */ |
240 | 241 | ||
241 | void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); | 242 | void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, |
243 | time_t*, int); | ||
242 | void channel_after_select(fd_set *, fd_set *); | 244 | void channel_after_select(fd_set *, fd_set *); |
243 | void channel_output_poll(void); | 245 | void channel_output_poll(void); |
244 | 246 | ||
@@ -253,6 +255,7 @@ void channel_set_af(int af); | |||
253 | void channel_permit_all_opens(void); | 255 | void channel_permit_all_opens(void); |
254 | void channel_add_permitted_opens(char *, int); | 256 | void channel_add_permitted_opens(char *, int); |
255 | int channel_add_adm_permitted_opens(char *, int); | 257 | int channel_add_adm_permitted_opens(char *, int); |
258 | void channel_disable_adm_local_opens(void); | ||
256 | void channel_update_permitted_opens(int, int); | 259 | void channel_update_permitted_opens(int, int); |
257 | void channel_clear_permitted_opens(void); | 260 | void channel_clear_permitted_opens(void); |
258 | void channel_clear_adm_permitted_opens(void); | 261 | void channel_clear_adm_permitted_opens(void); |