---

yaml --- r: 111995 b: refs/heads/master c: b9fb150 h: refs/heads/master i: 111993: bc5e239 111991: 0b022cd v: v3
git-mirror · Oct 1, 2008 · 54fab92 · 54fab92
1 parent d1fc7b8
commit 54fab92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 &&