Merged revisions 291263 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r291263 | tilghman | 2010-10-12 11:55:30 -0500 (Tue, 12 Oct 2010) | 2 lines

  Oops, incorrect range (although unallocated at ARIN)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@291264 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/acl.c b/main/acl.c
index 7fbd81d11b662a660a30ff19edf21ed2f4bf2a28..258f3c2def065f9053d7476390a0dc747eb48daa 100644 (file)
--- a/main/acl.c
+++ b/main/acl.c
@@ -77,8 +77,8 @@ static void score_address(const struct sockaddr_in *sin, struct in_addr *best_ad
                /* 172.20.0.0 - 172.29.255.255, but not 172.200.0.0 - 172.255.255.255 nor 172.2.0.0 - 172.2.255.255 */
                } else if (address[4] == '2' && address[6] == '.') {
                        score = -5;
-               /* 172.30.0.0 - 172.31.255.255 */
-               } else if (address[4] == '3' && address[5] <= '1') {
+               /* 172.30.0.0 - 172.31.255.255, but not 172.3.0.0 - 172.3.255.255 */
+               } else if (address[4] == '3' && (address[5] == '0' || address[5] == '1')) {
                        score = -5;
                /* All other 172 addresses are public */
                } else {