diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-04-03 02:40:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-04-03 13:42:33 +1100 |
commit | 663e84bb53de2a60e56a44d538d25b8152b5c1cc (patch) | |
tree | 2b8a180730e1bd4e130f1af40800b0393beb818e /clientloop.h | |
parent | ed833da176611a39d3376d62154eb88eb440d31c (diff) |
upstream: make failures when establishing "Tunnel" forwarding terminate
the connection when ExitOnForwardFailure is enabled; bz3116; ok dtucker
OpenBSD-Commit-ID: ef4b4808de0a419c17579b1081da768625c1d735
Diffstat (limited to 'clientloop.h')
-rw-r--r-- | clientloop.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clientloop.h b/clientloop.h index bf79c87bf..31630551b 100644 --- a/clientloop.h +++ b/clientloop.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.h,v 1.36 2018/07/09 21:03:30 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.h,v 1.37 2020/04/03 02:40:32 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -46,7 +46,8 @@ int client_x11_get_proto(struct ssh *, const char *, const char *, | |||
46 | void client_global_request_reply_fwd(int, u_int32_t, void *); | 46 | void client_global_request_reply_fwd(int, u_int32_t, void *); |
47 | void client_session2_setup(struct ssh *, int, int, int, | 47 | void client_session2_setup(struct ssh *, int, int, int, |
48 | const char *, struct termios *, int, struct sshbuf *, char **); | 48 | const char *, struct termios *, int, struct sshbuf *, char **); |
49 | char *client_request_tun_fwd(struct ssh *, int, int, int); | 49 | char *client_request_tun_fwd(struct ssh *, int, int, int, |
50 | channel_open_fn *, void *); | ||
50 | void client_stop_mux(void); | 51 | void client_stop_mux(void); |
51 | 52 | ||
52 | /* Escape filter for protocol 2 sessions */ | 53 | /* Escape filter for protocol 2 sessions */ |