View | Details | Raw Unified | Return to bug 7231
Collapse All | Expand All

(-)lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (-6 / +5 lines)
Lines 942-950 Link Here
942
    next unless (defined($str) && defined($dom));
942
    next unless (defined($str) && defined($dom));
943
    dbg("uridnsbl: got($j) NS for $dom: $str");
943
    dbg("uridnsbl: got($j) NS for $dom: $str");
944
944
945
    if ($str =~ /IN\s+NS\s+(\S+)/) {
945
    if ($rr->type eq 'NS') {
946
      my $nsmatch = lc $1;
946
      my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
947
      $nsmatch =~ s/\.$//;
948
      my $nsrhblstr = $nsmatch;
947
      my $nsrhblstr = $nsmatch;
949
      my $fullnsrhblstr = $nsmatch;
948
      my $fullnsrhblstr = $nsmatch;
950
949
Lines 1025-1033 Link Here
1025
    }
1024
    }
1026
    dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
1025
    dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
1027
1026
1028
    local $1;
1027
    if ($rr->type eq 'A') {
1029
    if ($str =~ /IN\s+A\s+(\S+)/) {
1028
      my $ip_address = $rr->rdatastr;
1030
      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
1029
      $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
1031
    }
1030
    }
1032
  }
1031
  }
1033
}
1032
}

Return to bug 7231