[svn-commits] tilghman: trunk r291266 - in /trunk: ./ main/acl.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Oct 12 12:07:20 2010
New Revision: 291266

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=291266
Log:
Merged revisions 291265 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291265 | tilghman | 2010-10-12 12:06:23 -0500 (Tue, 12 Oct 2010) | 16 lines
  
  Merged revisions 291264 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r291264 | tilghman | 2010-10-12 12:05:31 -0500 (Tue, 12 Oct 2010) | 9 lines
    
    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)
    ........
  ................
................

Modified:
    trunk/   (props changed)
    trunk/main/acl.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/acl.c?view=diff&rev=291266&r1=291265&r2=291266
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Tue Oct 12 12:07:20 2010
@@ -77,8 +77,8 @@
 		/* 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 {