You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/10/11 17:39:03 UTC
svn commit: r1904528 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Author: hege
Date: Tue Oct 11 17:39:03 2022
New Revision: 1904528
URL: http://svn.apache.org/viewvc?rev=1904528&view=rev
Log:
Bug 8059 - Fix meta handling for URIDNSBL NS/A lookups
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=1904528&r1=1904527&r2=1904528&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Oct 11 17:39:03 2022
@@ -971,6 +971,12 @@ sub complete_ns_lookup {
}
}
}
+
+ # Make sure all finished rules are marked ready. If foreach block above
+ # launched new lookups, rule_ready() simply ignores them.
+ foreach my $rulename (@{$ent->{rulename}}) {
+ $pms->rule_ready($rulename);
+ }
}
# ---------------------------------------------------------------------------
@@ -1001,8 +1007,10 @@ sub complete_a_lookup {
dbg("uridnsbl: complete_a_lookup aborted %s", $ent->{key});
return;
}
+
dbg("uridnsbl: complete_a_lookup %s %s", $ent->{key},
join(',', @{$ent->{rulename}}));
+
my $j = 0;
my @answer = $pkt->answer;
foreach my $rr (@answer) {
@@ -1013,6 +1021,12 @@ sub complete_a_lookup {
$j, $ent->{lookup}, $ip_address);
$self->lookup_dnsbl_for_ip($pms, $ip_address, $ent);
}
+
+ # Make sure all finished rules are marked ready. If foreach block above
+ # launched new lookups, rule_ready() simply ignores them.
+ foreach my $rulename (@{$ent->{rulename}}) {
+ $pms->rule_ready($rulename);
+ }
}
# ---------------------------------------------------------------------------