You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2006/08/09 04:33:13 UTC

svn commit: r429931 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Author: sidney
Date: Tue Aug  8 19:33:13 2006
New Revision: 429931

URL: http://svn.apache.org/viewvc?rev=429931&view=rev
Log:
bug 4842: remove obsolete workaround that results in bogus warnings in URIDNSBL code

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?rev=429931&r1=429930&r2=429931&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Aug  8 19:33:13 2006
@@ -568,8 +568,6 @@
   my @answer = $packet->answer;
 
   my $uridnsbl_subs = $conf->{uridnsbl_subs}->{$ent->{zone}};
-  my $uridnsbl_subs_bits = 0;
-  $uridnsbl_subs_bits |= $_ for keys %{$uridnsbl_subs};
   foreach my $rr (@answer)
   {
     next if ($rr->type ne 'A' && $rr->type ne 'TXT');
@@ -588,15 +586,6 @@
       $self->got_dnsbl_hit($scanstate, $ent, $rdatastr, $dom, $rulename);
     }
     else {
-      # skip any A record that isn't on 127/8 if we're not looking for
-      # any bits in the first octet, this is a workaround for bug 3997
-      if ($rr->type eq 'A' && $rr->rdatastr !~ /^127\./ &&
-	  !($uridnsbl_subs_bits & 0xff000000))
-      {
-	warn("uridnsbl: bogus rr: domain=$dom, zone=$ent->{zone}, id=" .
-            $packet->header->id." rr=".$rr->string);
-	next;
-      }
       foreach my $subtest (keys (%{$uridnsbl_subs}))
       {
         my $subrulename = $uridnsbl_subs->{$subtest}->{rulename};