From 54fab921dc945127929068b69f48cf047594b75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=B3th=20L=C3=A1szl=C3=B3=20Attila?= Date: Wed, 1 Oct 2008 07:31:24 -0700 Subject: [PATCH] --- yaml --- r: 111995 b: refs/heads/master c: b9fb15067ce93497bef852c05e406d7a96212a9a h: refs/heads/master i: 111993: bc5e239c46e095b99efbcc06860e267ea52f41c1 111991: 0b022cdd397c223ee6292168be3ad9aecdadf021 v: v3 --- [refs] | 2 +- trunk/net/ipv4/af_inet.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0d03f212aa00..95bb490ee379 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5715aea4564f233767ea1d944b2637a5fd7cd2e +refs/heads/master: b9fb15067ce93497bef852c05e406d7a96212a9a diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c index 8a3ac1fa71a9..1fbff5fa4241 100644 --- a/trunk/net/ipv4/af_inet.c +++ b/trunk/net/ipv4/af_inet.c @@ -469,7 +469,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) */ err = -EADDRNOTAVAIL; if (!sysctl_ip_nonlocal_bind && - !inet->freebind && + !(inet->freebind || inet->transparent) && addr->sin_addr.s_addr != htonl(INADDR_ANY) && chk_addr_ret != RTN_LOCAL && chk_addr_ret != RTN_MULTICAST &&