svn commit: rev 47519 - spamassassin/trunk/lib/Mail/SpamAssassin/Util

[fe...@apache.org]

Author: felicity
Date: Wed Sep 29 16:35:16 2004
New Revision: 47519

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
Log:
bug 3831: fixed one-off error causing slightly different misparsing of fqdn->domain

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/RegistrarBoundaries.pm	Wed Sep 29 16:35:16 2004
@@ -999,15 +999,16 @@
     # Split scalar domain into components
     my @domparts = split (/\./, $domain);
 
-    # Look for a lower level TLD
-    # use $#domparts to skip trying to match on TLDs that can't possibly
-    # match, but keep in mind that the hostname can be blank.
+    # Look for a sub-delegated TLD
+    # use @domparts to skip trying to match on TLDs that can't possibly
+    # match, but keep in mind that the hostname can be blank, so 4TLD needs 4,
+    # 3TLD needs 3, 2TLD needs 2 ...
     #
-    if ($#domparts >= 4 && $domain =~ /(?:\.|^)${FOUR_LEVEL_DOMAINS}$/io)     # Fire-Dept.CI.Los-Angeles.CA.US
+    if (@domparts >= 4 && $domain =~ /(?:\.|^)${FOUR_LEVEL_DOMAINS}$/io)     # Fire-Dept.CI.Los-Angeles.CA.US
     { $partsreqd = 5; }
-    elsif ($#domparts >= 3 && $domain =~ /(?:\.|^)${THREE_LEVEL_DOMAINS}$/io) # demon.co.uk
+    elsif (@domparts >= 3 && $domain =~ /(?:\.|^)${THREE_LEVEL_DOMAINS}$/io) # demon.co.uk
     { $partsreqd = 4; }
-    elsif ($#domparts >= 2 && $domain =~ /(?:\.|^)${TWO_LEVEL_DOMAINS}$/io)   # co.uk
+    elsif (@domparts >= 2 && $domain =~ /(?:\.|^)${TWO_LEVEL_DOMAINS}$/io)   # co.uk
     { $partsreqd = 3; }
 
     if (@domparts >= $partsreqd) {