spamassassin/trunk/net-dns-1.01-compat-uribl.patch

   1 --- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm  2015/04/28 20:36:05     1676616
   2 +++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm  2015/08/04 23:16:38     1694126
   3 @@ -942,9 +942,8 @@
   4      next unless (defined($str) && defined($dom));
   5      dbg("uridnsbl: got($j) NS for $dom: $str");
   6
   7 -    if ($str =~ /IN\s+NS\s+(\S+)/) {
   8 -      my $nsmatch = lc $1;
   9 -      $nsmatch =~ s/\.$//;
  10 +    if ($rr->type eq 'NS') {
  11 +      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
  12        my $nsrhblstr = $nsmatch;
  13        my $fullnsrhblstr = $nsmatch;
  14
  15 @@ -1025,9 +1024,9 @@
  16      }
  17      dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
  18
  19 -    local $1;
  20 -    if ($str =~ /IN\s+A\s+(\S+)/) {
  21 -      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
  22 +    if ($rr->type eq 'A') {
  23 +      my $ip_address = $rr->rdatastr;
  24 +      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
  25      }
  26    }
  27  }