diff options
author | Damien Miller <djm@mindrot.org> | 2014-07-02 07:29:40 +0200 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-07-02 07:29:40 +0200 |
commit | 4b3ed647d5b328cf68e6a8ffbee490d8e0683e82 (patch) | |
tree | ab21f41c022d2d8f1f8d2a3814f77d10d4c72e7e /clientloop.c | |
parent | - deraadt@cvs.openbsd.org 2014/06/25 14:16:09 (diff) | |
download | openssh-4b3ed647d5b328cf68e6a8ffbee490d8e0683e82.tar.xz openssh-4b3ed647d5b328cf68e6a8ffbee490d8e0683e82.zip |
- 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 'clientloop.c')
-rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index 203151ea8..02510e26d 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.259 2014/04/29 13:10:30 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.260 2014/06/27 16:41:56 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1849,7 +1849,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) "originator %s port %d", listen_address, listen_port, originator_address, originator_port); - c = channel_connect_by_listen_address(listen_port, + c = channel_connect_by_listen_address(listen_address, listen_port, "forwarded-tcpip", originator_address); free(originator_address); |