You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/12/03 18:23:15 UTC

svn commit: r109710 - /spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Author: felicity
Date: Fri Dec  3 09:23:15 2004
New Revision: 109710

URL: http://svn.apache.org/viewcvs?view=rev&rev=109710
Log:
have the URIDNSBL plugin handle both head and body evals as a kluge from 3.0.0
Modified:
   spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Modified: spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
Url: http://svn.apache.org/viewcvs/spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm?view=diff&rev=109710&p1=spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm&r1=109709&p2=spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm&r2=109710
==============================================================================
--- spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	(original)
+++ spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm	Fri Dec  3 09:23:15 2004
@@ -166,7 +166,10 @@
   $scanstate->{active_rules_rhsbl} = { };
   $scanstate->{active_rules_revipbl} = { };
   foreach my $rulename (keys %{$scanner->{conf}->{uridnsbls}}) {
-    next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename));
+    # handle both body and head_evals for now
+    # head_evals was 3.0.0, body_evals is 3.0.1 and beyond
+    next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename) ||
+    		 $scanner->{conf}->is_rule_active('head_evals',$rulename));
 
     my $rulecf = $scanstate->{scanner}->{conf}->{uridnsbls}->{$rulename};
     if ($rulecf->{is_rhsbl}) {

Re: svn commit: r109710 - /spamassassin/branches/3.0/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm

Posted by Theo Van Dinter <fe...@kluge.net>.
This came up on the list, I considered it trivial enough to just go
ahead and commit it to the 3.0 branch.  If there's an issue, let me know.

On Fri, Dec 03, 2004 at 05:23:15PM -0000, felicity@apache.org wrote:
> -    next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename));
> +    next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename) ||
> +    		 $scanner->{conf}->is_rule_active('head_evals',$rulename));


-- 
Randomly Generated Tagline:
Step aside, everyone!  Sensitive love letters are my specialty.  Dear
 Baby, Welcome to Dumpsville.  Population: you.
 
 		-- Homer Simpson
 		   Bart the Lover