- djm@cvs.openbsd.org 2008/01/19 23:02:40

[channels.c]
     When we added support for specified bind addresses for port forwards, we
     added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of
     this for -L port forwards that causes the client to listen on both v4
     and v6 addresses when connected to a server with this quirk, despite
     having set 0.0.0.0 as a bind_address.
     report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@
This commit is contained in:
Damien Miller 2008-02-10 22:25:24 +11:00
parent cb2fbb2407
commit 3de49f8951
2 changed files with 11 additions and 3 deletions

View File

@ -32,6 +32,14 @@
- djm@cvs.openbsd.org 2008/01/19 22:37:19 - djm@cvs.openbsd.org 2008/01/19 22:37:19
[ssh-keygen.c] [ssh-keygen.c]
unbreak line numbering (broken in revision 1.164), fix error message unbreak line numbering (broken in revision 1.164), fix error message
- djm@cvs.openbsd.org 2008/01/19 23:02:40
[channels.c]
When we added support for specified bind addresses for port forwards, we
added a quirk SSH_OLD_FORWARD_ADDR. There is a bug in our handling of
this for -L port forwards that causes the client to listen on both v4
and v6 addresses when connected to a server with this quirk, despite
having set 0.0.0.0 as a bind_address.
report and patch from Jan.Pechanec AT Sun.COM; ok dtucker@
20080119 20080119
- (djm) Silence noice from expr in ssh-copy-id; patch from - (djm) Silence noice from expr in ssh-copy-id; patch from
@ -3560,4 +3568,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4826 2008/02/10 11:24:55 djm Exp $ $Id: ChangeLog,v 1.4827 2008/02/10 11:25:24 djm Exp $

View File

@ -1,4 +1,4 @@
/* $OpenBSD: channels.c,v 1.271 2007/12/27 14:22:08 dtucker Exp $ */ /* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 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
@ -2385,7 +2385,7 @@ channel_setup_fwd_listener(int type, const char *listen_addr, u_short listen_por
wildcard = 1; wildcard = 1;
} else if (gateway_ports || is_client) { } else if (gateway_ports || is_client) {
if (((datafellows & SSH_OLD_FORWARD_ADDR) && if (((datafellows & SSH_OLD_FORWARD_ADDR) &&
strcmp(listen_addr, "0.0.0.0") == 0) || strcmp(listen_addr, "0.0.0.0") == 0 && is_client == 0) ||
*listen_addr == '\0' || strcmp(listen_addr, "*") == 0 || *listen_addr == '\0' || strcmp(listen_addr, "*") == 0 ||
(!is_client && gateway_ports == 1)) (!is_client && gateway_ports == 1))
wildcard = 1; wildcard = 1;