tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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
This commit is contained in:
Damien Miller 2013-01-09 15:55:50 +11:00
parent 4e14a58f3f
commit 73298f420e
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
- dtucker@cvs.openbsd.org 2012/12/14 05:26:43 - dtucker@cvs.openbsd.org 2012/12/14 05:26:43
[auth.c] [auth.c]
use correct string in error message; from rustybsd at gmx.fr use correct string in error message; from rustybsd at gmx.fr
- 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
20121217 20121217
- (dtucker) [Makefile.in] Add some scaffolding so that the new regress - (dtucker) [Makefile.in] Add some scaffolding so that the new regress

6
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.247 2012/09/07 06:34:21 dtucker Exp $ */ /* $OpenBSD: clientloop.c,v 1.248 2013/01/02 00:32:07 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -968,9 +968,9 @@ process_cmdline(void)
goto out; goto out;
} }
if (local || dynamic) { if (local || dynamic) {
if (channel_setup_local_fwd_listener(fwd.listen_host, if (!channel_setup_local_fwd_listener(fwd.listen_host,
fwd.listen_port, fwd.connect_host, fwd.listen_port, fwd.connect_host,
fwd.connect_port, options.gateway_ports) < 0) { fwd.connect_port, options.gateway_ports)) {
logit("Port forwarding failed."); logit("Port forwarding failed.");
goto out; goto out;
} }

6
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.37 2012/08/17 00:45:45 dtucker Exp $ */ /* $OpenBSD: mux.c,v 1.38 2013/01/02 00:32:07 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -738,9 +738,9 @@ process_mux_open_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r)
} }
if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) { if (ftype == MUX_FWD_LOCAL || ftype == MUX_FWD_DYNAMIC) {
if (channel_setup_local_fwd_listener(fwd.listen_host, if (!channel_setup_local_fwd_listener(fwd.listen_host,
fwd.listen_port, fwd.connect_host, fwd.connect_port, fwd.listen_port, fwd.connect_host, fwd.connect_port,
options.gateway_ports) < 0) { options.gateway_ports)) {
fail: fail:
logit("slave-requested %s failed", fwd_desc); logit("slave-requested %s failed", fwd_desc);
buffer_put_int(r, MUX_S_FAILURE); buffer_put_int(r, MUX_S_FAILURE);