summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-01-09 15:55:50 +1100
committerDamien Miller <djm@mindrot.org>2013-01-09 15:55:50 +1100
commit73298f420efd37659f462d3eb10d8a7f71022e1b (patch)
treec35b83e75afa9ba2eca1c6c072ae9621620b7e2c /mux.c
parent4e14a58f3f01842ba6a50f84d0ddaa12d6bed62b (diff)
- djm@cvs.openbsd.org 2013/01/02 00:32:07
[clientloop.c mux.c] channel_setup_local_fwd_listener() returns 0 on failure, not -ve bz#2055 reported by mathieu.lacage AT gmail.com
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mux.c b/mux.c
index 0f1532bb5..1b24660b2 100644
--- a/mux.c
+++ b/mux.c
@@ -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);