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/09/29 03:30:47 UTC
svn commit: rev 47438 - in spamassassin/trunk: lib/Mail/SpamAssassin/Plugin rules
Author: felicity
Date: Tue Sep 28 18:30:45 2004
New Revision: 47438
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
spamassassin/trunk/rules/25_uribl.cf
Log:
bug 3734: URIBL rules should be body evals not header evals -- we get the URIs out of the body not the header. it impacts the autolearning head/body points thing, and is otherwise just annoyingly misplaced.
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm Tue Sep 28 18:30:45 2004
@@ -138,7 +138,6 @@
# this is just a placeholder; in fact the results are dealt with later
sub check_uridnsbl {
- my ($self, $permsgstatus, $rulename) = @_;
return 0;
}
@@ -167,7 +166,7 @@
$scanstate->{active_rules_rhsbl} = { };
$scanstate->{active_rules_revipbl} = { };
foreach my $rulename (keys %{$scanner->{conf}->{uridnsbls}}) {
- next unless ($scanner->{conf}->is_rule_active('head_evals',$rulename));
+ next unless ($scanner->{conf}->is_rule_active('body_evals',$rulename));
my $rulecf = $scanstate->{scanner}->{conf}->{uridnsbls}->{$rulename};
if ($rulecf->{is_rhsbl}) {
Modified: spamassassin/trunk/rules/25_uribl.cf
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Tue Sep 28 18:30:45 2004
@@ -34,37 +34,37 @@
uridnsbl_timeout 2
uridnsbl URIBL_SBL sbl.spamhaus.org. TXT
-header URIBL_SBL eval:check_uridnsbl('URIBL_SBL')
+body URIBL_SBL eval:check_uridnsbl('URIBL_SBL')
describe URIBL_SBL Contains an URL listed in the SBL blocklist
tflags URIBL_SBL net
urirhssub URIBL_SC_SURBL multi.surbl.org. A 2
-header URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
+body URIBL_SC_SURBL eval:check_uridnsbl('URIBL_SC_SURBL')
describe URIBL_SC_SURBL Contains an URL listed in the SC SURBL blocklist
tflags URIBL_SC_SURBL net
urirhssub URIBL_WS_SURBL multi.surbl.org. A 4
-header URIBL_WS_SURBL eval:check_uridnsbl('URIBL_WS_SURBL')
+body URIBL_WS_SURBL eval:check_uridnsbl('URIBL_WS_SURBL')
describe URIBL_WS_SURBL Contains an URL listed in the WS SURBL blocklist
tflags URIBL_WS_SURBL net
urirhssub URIBL_PH_SURBL multi.surbl.org. A 8
-header URIBL_PH_SURBL eval:check_uridnsbl('URIBL_PH_SURBL')
+body URIBL_PH_SURBL eval:check_uridnsbl('URIBL_PH_SURBL')
describe URIBL_PH_SURBL Contains an URL listed in the PH SURBL blocklist
tflags URIBL_PH_SURBL net
urirhssub URIBL_OB_SURBL multi.surbl.org. A 16
-header URIBL_OB_SURBL eval:check_uridnsbl('URIBL_OB_SURBL')
+body URIBL_OB_SURBL eval:check_uridnsbl('URIBL_OB_SURBL')
describe URIBL_OB_SURBL Contains an URL listed in the OB SURBL blocklist
tflags URIBL_OB_SURBL net
urirhssub URIBL_AB_SURBL multi.surbl.org. A 32
-header URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
+body URIBL_AB_SURBL eval:check_uridnsbl('URIBL_AB_SURBL')
describe URIBL_AB_SURBL Contains an URL listed in the AB SURBL blocklist
tflags URIBL_AB_SURBL net
urirhssub URIBL_JP_SURBL multi.surbl.org. A 64
-header URIBL_JP_SURBL eval:check_uridnsbl('URIBL_JP_SURBL')
+body URIBL_JP_SURBL eval:check_uridnsbl('URIBL_JP_SURBL')
describe URIBL_JP_SURBL Contains an URL listed in the JP SURBL blocklist
tflags URIBL_JP_SURBL net