mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -04:00
9a8a02b39c
with the output of the new Net::DNS version. See https://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?r1=1694126&r2=1694125&pathrev=1694126&view=patch for more information. PR: 202281 Submitted by: Mark Martinec, author of the upstream patch
27 lines
913 B
Text
27 lines
913 B
Text
--- lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2015/08/04 23:14:23 1694125
|
|
+++ lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 2015/08/04 23:16:38 1694126
|
|
@@ -942,9 +942,8 @@
|
|
next unless (defined($str) && defined($dom));
|
|
dbg("uridnsbl: got($j) NS for $dom: $str");
|
|
|
|
- if ($str =~ /IN\s+NS\s+(\S+)/) {
|
|
- my $nsmatch = lc $1;
|
|
- $nsmatch =~ s/\.$//;
|
|
+ if ($rr->type eq 'NS') {
|
|
+ my $nsmatch = lc $rr->nsdname; # available since at least Net::DNS 0.14
|
|
my $nsrhblstr = $nsmatch;
|
|
my $fullnsrhblstr = $nsmatch;
|
|
|
|
@@ -1025,9 +1024,9 @@
|
|
}
|
|
dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
|
|
|
|
- local $1;
|
|
- if ($str =~ /IN\s+A\s+(\S+)/) {
|
|
- $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
|
|
+ if ($rr->type eq 'A') {
|
|
+ my $ip_address = $rr->rdatastr;
|
|
+ $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
|
|
}
|
|
}
|
|
}
|