diff options
author | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:59:03 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2011-10-02 18:59:03 +1100 |
commit | 68afb8c5f242ec74f48fd86137122399435dd757 (patch) | |
tree | a41fb99a2df717111d5c1a05f51b3791580218d1 /readconf.c | |
parent | 1338b9e067055259033a05e14db0bc2ad5536482 (diff) |
- markus@cvs.openbsd.org 2011/09/23 07:45:05
[mux.c readconf.h channels.h compat.h compat.c ssh.c readconf.c channels.c version.h]
unbreak remote portforwarding with dynamic allocated listen ports:
1) send the actual listen port in the open message (instead of 0).
this allows multiple forwardings with a dynamic listen port
2) update the matching permit-open entry, so we can identify where
to connect to
report: den at skbkontur.ru and P. Szczygielski
feedback and ok djm@
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/readconf.c b/readconf.c index 91dfa566f..097bb0515 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.193 2011/05/24 07:15:47 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 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 |
@@ -294,6 +294,7 @@ add_remote_forward(Options *options, const Forward *newfwd) | |||
294 | fwd->listen_port = newfwd->listen_port; | 294 | fwd->listen_port = newfwd->listen_port; |
295 | fwd->connect_host = newfwd->connect_host; | 295 | fwd->connect_host = newfwd->connect_host; |
296 | fwd->connect_port = newfwd->connect_port; | 296 | fwd->connect_port = newfwd->connect_port; |
297 | fwd->handle = newfwd->handle; | ||
297 | fwd->allocated_port = 0; | 298 | fwd->allocated_port = 0; |
298 | } | 299 | } |
299 | 300 | ||