You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/11/30 10:47:24 UTC

svn commit: r106991 - /spamassassin/trunk/rules/20_dnsbl_tests.cf /spamassassin/trunk/rules/70_testing.cf

Author: quinlan
Date: Tue Nov 30 01:47:22 2004
New Revision: 106991

URL: http://svn.apache.org/viewcvs?view=rev&rev=106991
Log:
using EnvelopeFrom seems better for domain-based blacklists

Modified:
   spamassassin/trunk/rules/20_dnsbl_tests.cf
   spamassassin/trunk/rules/70_testing.cf

Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=106991&p1=spamassassin/trunk/rules/20_dnsbl_tests.cf&r1=106990&p2=spamassassin/trunk/rules/20_dnsbl_tests.cf&r2=106991
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf	(original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf	Tue Nov 30 01:47:22 2004
@@ -187,7 +187,7 @@
 ########################################################################
 
 # another domain-based blacklist
-header DNS_FROM_AHBL_RHSBL	eval:check_rbl_from_host('ahbl', 'rhsbl.ahbl.org.')
+header DNS_FROM_AHBL_RHSBL	eval:check_rbl_envfrom('ahbl', 'rhsbl.ahbl.org.')
 describe DNS_FROM_AHBL_RHSBL	From: sender listed in dnsbl.ahbl.org
 tflags DNS_FROM_AHBL_RHSBL	net
 

Modified: spamassassin/trunk/rules/70_testing.cf
Url: http://svn.apache.org/viewcvs/spamassassin/trunk/rules/70_testing.cf?view=diff&rev=106991&p1=spamassassin/trunk/rules/70_testing.cf&r1=106990&p2=spamassassin/trunk/rules/70_testing.cf&r2=106991
==============================================================================
--- spamassassin/trunk/rules/70_testing.cf	(original)
+++ spamassassin/trunk/rules/70_testing.cf	Tue Nov 30 01:47:22 2004
@@ -279,16 +279,6 @@
 
 ##########################################################################
 
-# try From: instead of EnvelopeFrom
-header T_DNS_FROM_SECURITYSAGE	eval:check_rbl_from_host('t_securitysage', 'blackhole.securitysage.com.')
-tflags T_DNS_FROM_SECURITYSAGE	net
-
-# try EnvelopeFrom instead of From:
-header T_DNS_FROM_AHBL_RHSBL	eval:check_rbl_envfrom('t_ahbl', 'rhsbl.ahbl.org.')
-tflags T_DNS_FROM_AHBL_RHSBL	net
-
-##########################################################################
-
 # bug 2397 - CLA requested
 body T_DISGUISE_PORN_MUNDANE	/\b(?:h[0*]t|y[0*][uv]ng|b[0*]ys?|g[1*]r[1l]s?|g[1l]rls?|w[1*]ves|w[1*]fe|s3xy?|p[0*]rn[o0*]?)\b/i
 describe T_DISGUISE_PORN_MUNDANE	Attempts to disguise mundane words used in porn