diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 11 insertions, 3 deletions
@@ -32,6 +32,14 @@ | |||
32 | - djm@cvs.openbsd.org 2008/01/19 22:37:19 | 32 | - djm@cvs.openbsd.org 2008/01/19 22:37:19 |
33 | [ssh-keygen.c] | 33 | [ssh-keygen.c] |
34 | unbreak line numbering (broken in revision 1.164), fix error message | 34 | unbreak line numbering (broken in revision 1.164), fix error message |
35 | - djm@cvs.openbsd.org 2008/01/19 23:02:40 | ||
36 | [channels.c] | ||
37 | When we added support for specified bind addresses for port forwards, we | ||
38 | added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of | ||
39 | this for -L port forwards that causes the client to listen on both v4 | ||
40 | and v6 addresses when connected to a server with this quirk, despite | ||
41 | having set 0.0.0.0 as a bind_address. | ||
42 | report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@ | ||
35 | 43 | ||
36 | 20080119 | 44 | 20080119 |
37 | - (djm) Silence noice from expr in ssh-copy-id; patch from | 45 | - (djm) Silence noice from expr in ssh-copy-id; patch from |
@@ -3560,4 +3568,4 @@ | |||
3560 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3568 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3561 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3569 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3562 | 3570 | ||
3563 | $Id: ChangeLog,v 1.4826 2008/02/10 11:24:55 djm Exp $ | 3571 | $Id: ChangeLog,v 1.4827 2008/02/10 11:25:24 djm Exp $ |
diff --git a/channels.c b/channels.c index 25ebe1294..c766cc275 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.271 2007/12/27 14:22:08 dtucker Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 djm 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 |
@@ -2385,7 +2385,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por | |||
2385 | wildcard = 1; | 2385 | wildcard = 1; |
2386 | } else if (gateway_ports || is_client) { | 2386 | } else if (gateway_ports || is_client) { |
2387 | if (((datafellows & SSH_OLD_FORWARD_ADDR) && | 2387 | if (((datafellows & SSH_OLD_FORWARD_ADDR) && |
2388 | strcmp(listen_addr, "0.0.0.0") == 0) || | 2388 | strcmp(listen_addr, "0.0.0.0") == 0 && is_client == 0) || |
2389 | *listen_addr == '\0' || strcmp(listen_addr, "*") == 0 || | 2389 | *listen_addr == '\0' || strcmp(listen_addr, "*") == 0 || |
2390 | (!is_client && gateway_ports == 1)) | 2390 | (!is_client && gateway_ports == 1)) |
2391 | wildcard = 1; | 2391 | wildcard = 1; |