svn commit: r160606 - spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

[qu...@apache.org]

Author: quinlan
Date: Fri Apr  8 13:55:42 2005
New Revision: 160606

URL: http://svn.apache.org/viewcvs?view=rev&rev=160606
Log:
IP_PRIVATE regexp already contains ^ at beginning

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm?view=diff&r1=160605&r2=160606
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/EvalTests.pm Fri Apr  8 13:55:42 2005
@@ -2789,10 +2789,10 @@
   for my $relay (@{$self->{relays_untrusted}}) {
     # is HELO usable?
     next unless ($relay->{helo} =~ m/^$IP_ADDRESS$/ &&
-		 $relay->{helo} !~ /^$IP_PRIVATE/);
+		 $relay->{helo} !~ /$IP_PRIVATE/);
     # compare HELO with IP
     return 1 if ($relay->{ip} =~ m/^$IP_ADDRESS$/ &&
-		 $relay->{ip} !~ m/^$IP_PRIVATE/ &&
+		 $relay->{ip} !~ m/$IP_PRIVATE/ &&
 		 $relay->{helo} ne $relay->{ip} &&
 		 # different IP is okay if in same /24
 		 $relay->{helo} =~ /^(\d+\.\d+\.\d+\.)/ &&
@@ -3114,7 +3114,7 @@
   if ($rcvd) {
     my $IP_ADDRESS = IPV4_ADDRESS;
     my $IP_PRIVATE = IP_PRIVATE;
-    if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /^$IP_PRIVATE/) {
+    if ($rcvd =~ /helo=($IP_ADDRESS)\b/i && $1 !~ /$IP_PRIVATE/) {
       return 1;
     }
   }
@@ -3174,7 +3174,7 @@
   my $IP_PRIVATE = IP_PRIVATE;
   for my $uri ($self->get_uri_list()) {
     if ($uri =~ m{^https?://[^/?]*\b($IP_ADDRESS)\b}i &&
-	$1 !~ /^$IP_PRIVATE/)
+	$1 !~ /$IP_PRIVATE/)
     {
       return 1;
     }