svn commit: rev 23085 - spamassassin/trunk/lib/Mail/SpamAssassin

[pa...@apache.org]

Author: parker
Date: Tue Jul 20 10:08:20 2004
New Revision: 23085

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Log:
Bug 3538: Add sanity check after all rules have been checked to make sure that harvest_dnsbl_queries is run

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Tue Jul 20 10:08:20 2004
@@ -204,6 +204,17 @@
       $self->do_full_eval_tests($priority, \$fulltext);
     }
 
+    # sanity check, it is possible that no rules >= HARVEST_DNSBL_PRIORITY ran so the harvest
+    # may not have run yet.  Check, and if so, go ahead and harvest here.
+    if ($needs_dnsbl_harvest_p) {
+      # harvest the DNS results
+      $self->harvest_dnsbl_queries();
+
+      # finish the DNS results
+      $self->rbl_finish();
+      $self->{main}->call_plugins ("check_post_dnsbl", { permsgstatus => $self });
+    }
+
     # finished running rules
     delete $self->{current_rule_name};
     undef $decoded;