diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:40 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 15:29:40 +1000 |
commit | 4b3ed647d5b328cf68e6a8ffbee490d8e0683e82 (patch) | |
tree | ab21f41c022d2d8f1f8d2a3814f77d10d4c72e7e /ssh.c | |
parent | 9e01ff28664921ce9b6500681333e42fb133b4d0 (diff) |
- markus@cvs.openbsd.org 2014/06/27 16:41:56
[channels.c channels.h clientloop.c ssh.c]
fix remote fwding with same listen port but different listen address
with gerhard@, ok djm@
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.403 2014/06/24 02:19:48 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.404 2014/06/27 16:41:56 markus 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 |
@@ -1279,8 +1279,10 @@ ssh_confirm_remote_forward(int type, u_int32_t seq, void *ctxt) | |||
1279 | Forward *rfwd = (Forward *)ctxt; | 1279 | Forward *rfwd = (Forward *)ctxt; |
1280 | 1280 | ||
1281 | /* XXX verbose() on failure? */ | 1281 | /* XXX verbose() on failure? */ |
1282 | debug("remote forward %s for: listen %d, connect %s:%d", | 1282 | debug("remote forward %s for: listen %s%s%d, connect %s:%d", |
1283 | type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", | 1283 | type == SSH2_MSG_REQUEST_SUCCESS ? "success" : "failure", |
1284 | rfwd->listen_host == NULL ? "" : rfwd->listen_host, | ||
1285 | rfwd->listen_host == NULL ? "" : ":", | ||
1284 | rfwd->listen_port, rfwd->connect_host, rfwd->connect_port); | 1286 | rfwd->listen_port, rfwd->connect_host, rfwd->connect_port); |
1285 | if (rfwd->listen_port == 0) { | 1287 | if (rfwd->listen_port == 0) { |
1286 | if (type == SSH2_MSG_REQUEST_SUCCESS) { | 1288 | if (type == SSH2_MSG_REQUEST_SUCCESS) { |