diff options
| author | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-05 18:12:34 -0500 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /net/ipv4/af_inet.c | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/ipv4/af_inet.c')
| -rw-r--r-- | net/ipv4/af_inet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 8a3ac1fa71a9..1fbff5fa4241 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c | |||
| @@ -469,7 +469,7 @@ int inet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
| 469 | */ | 469 | */ |
| 470 | err = -EADDRNOTAVAIL; | 470 | err = -EADDRNOTAVAIL; |
| 471 | if (!sysctl_ip_nonlocal_bind && | 471 | if (!sysctl_ip_nonlocal_bind && |
| 472 | !inet->freebind && | 472 | !(inet->freebind || inet->transparent) && |
| 473 | addr->sin_addr.s_addr != htonl(INADDR_ANY) && | 473 | addr->sin_addr.s_addr != htonl(INADDR_ANY) && |
| 474 | chk_addr_ret != RTN_LOCAL && | 474 | chk_addr_ret != RTN_LOCAL && |
| 475 | chk_addr_ret != RTN_MULTICAST && | 475 | chk_addr_ret != RTN_MULTICAST && |