diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2017-02-01 02:59:09 +0000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2017-02-03 14:23:24 +1100 |
commit | 858252fb1d451ebb0969cf9749116c8f0ee42753 (patch) | |
tree | 86168774d4d73763e0114ec62d7abeb29fbfba12 /channels.h | |
parent | 6ba9f893838489add6ec4213c7a997b425e4a9e0 (diff) |
upstream commit
Return true reason for port forwarding failures where
feasible rather than always "administratively prohibited". bz#2674, ok djm@
Upstream-ID: d901d9887951774e604ca970e1827afaaef9e419
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels.h b/channels.h index 09c3c3655..ce43236d5 100644 --- a/channels.h +++ b/channels.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.h,v 1.120 2016/10/18 17:32:54 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.h,v 1.121 2017/02/01 02:59:09 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -275,7 +275,8 @@ void channel_update_permitted_opens(int, int); | |||
275 | void channel_clear_permitted_opens(void); | 275 | void channel_clear_permitted_opens(void); |
276 | void channel_clear_adm_permitted_opens(void); | 276 | void channel_clear_adm_permitted_opens(void); |
277 | void channel_print_adm_permitted_opens(void); | 277 | void channel_print_adm_permitted_opens(void); |
278 | Channel *channel_connect_to_port(const char *, u_short, char *, char *); | 278 | Channel *channel_connect_to_port(const char *, u_short, char *, char *, int *, |
279 | const char **); | ||
279 | Channel *channel_connect_to_path(const char *, char *, char *); | 280 | Channel *channel_connect_to_path(const char *, char *, char *); |
280 | Channel *channel_connect_stdio_fwd(const char*, u_short, int, int); | 281 | Channel *channel_connect_stdio_fwd(const char*, u_short, int, int); |
281 | Channel *channel_connect_by_listen_address(const char *, u_short, | 282 | Channel *channel_connect_by_listen_address(const char *, u_short, |