diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | clientloop.c | 6 | ||||
-rw-r--r-- | mux.c | 6 |
3 files changed, 10 insertions, 6 deletions
@@ -3,6 +3,10 @@ | |||
3 | - dtucker@cvs.openbsd.org 2012/12/14 05:26:43 | 3 | - dtucker@cvs.openbsd.org 2012/12/14 05:26:43 |
4 | [auth.c] | 4 | [auth.c] |
5 | use correct string in error message; from rustybsd at gmx.fr | 5 | use correct string in error message; from rustybsd at gmx.fr |
6 | - djm@cvs.openbsd.org 2013/01/02 00:32:07 | ||
7 | [clientloop.c mux.c] | ||
8 | channel_setup_local_fwd_listener() returns 0 on failure, not -ve | ||
9 | bz#2055 reported by mathieu.lacage AT gmail.com | ||
6 | 10 | ||
7 | 20121217 | 11 | 20121217 |
8 | - (dtucker) [Makefile.in] Add some scaffolding so that the new regress | 12 | - (dtucker) [Makefile.in] Add some scaffolding so that the new regress |
diff --git a/clientloop.c b/clientloop.c index 564508146..c1d1d4472 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.247 2012/09/07 06:34:21 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.248 2013/01/02 00:32:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -968,9 +968,9 @@ process_cmdline(void) | |||
968 | goto out; | 968 | goto out; |
969 | } | 969 | } |
970 | if (local || dynamic) { | 970 | if (local || dynamic) { |
971 | if (channel_setup_local_fwd_listener(fwd.listen_host, | 971 | if (!channel_setup_local_fwd_listener(fwd.listen_host, |
972 | fwd.listen_port, fwd.connect_host, | 972 | fwd.listen_port, fwd.connect_host, |
973 | fwd.connect_port, options.gateway_ports) < 0) { | 973 | fwd.connect_port, options.gateway_ports)) { |
974 | logit("Port forwarding failed."); | 974 | logit("Port forwarding failed."); |
975 | goto out; | 975 | goto out; |
976 | } | 976 | } |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.37 2012/08/17 00:45:45 dtucker Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.38 2013/01/02 00:32:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -738,9 +738,9 @@ process_mux_open_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r) | |||
738 | } | 738 | } |
739 | 739 | ||
740 | if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) { | 740 | if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) { |
741 | if (channel_setup_local_fwd_listener(fwd.listen_host, | 741 | if (!channel_setup_local_fwd_listener(fwd.listen_host, |
742 | fwd.listen_port, fwd.connect_host, fwd.connect_port, | 742 | fwd.listen_port, fwd.connect_host, fwd.connect_port, |
743 | options.gateway_ports) < 0) { | 743 | options.gateway_ports)) { |
744 | fail: | 744 | fail: |
745 | logit("slave-requested %s failed", fwd_desc); | 745 | logit("slave-requested %s failed", fwd_desc); |
746 | buffer_put_int(r, MUX_S_FAILURE); | 746 | buffer_put_int(r, MUX_S_FAILURE); |