spamassassin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j.@apache.org
Subject svn commit: r920291 - in /spamassassin/trunk/rules: 25_uribl.cf 50_scores.cf
Date Mon, 08 Mar 2010 12:08:48 GMT
Author: jm
Date: Mon Mar  8 12:08:48 2010
New Revision: 920291

URL: http://svn.apache.org/viewvc?rev=920291&view=rev
Log:
bug 6335: rename URIBL_DBL to URIBL_DBL_SPAM, to make way for future DBL subtypes like phish
or malware; use new IP-address style lookup result; add URIBL_DBL_ERROR to detect lookups
of IP addresses due to SA bugs

Modified:
    spamassassin/trunk/rules/25_uribl.cf
    spamassassin/trunk/rules/50_scores.cf

Modified: spamassassin/trunk/rules/25_uribl.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_uribl.cf?rev=920291&r1=920290&r2=920291&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_uribl.cf (original)
+++ spamassassin/trunk/rules/25_uribl.cf Mon Mar  8 12:08:48 2010
@@ -33,19 +33,25 @@
 ###########################################################################
 ## Spamhaus
 
-uridnssub       URIBL_SBL       zen.spamhaus.org.       A   127.0.0.2
-body            URIBL_SBL       eval:check_uridnsbl('URIBL_SBL')
-describe        URIBL_SBL       Contains an URL listed in the SBL blocklist
-tflags          URIBL_SBL       net
+uridnssub       URIBL_SBL        zen.spamhaus.org.       A   127.0.0.2
+body            URIBL_SBL        eval:check_uridnsbl('URIBL_SBL')
+describe        URIBL_SBL        Contains an URL listed in the SBL blocklist
+tflags          URIBL_SBL        net
 reuse           URIBL_SBL
 
-# DBL, http://www.spamhaus.org/dbl/ .  Note that hits return 127.0.1.x
-# A records, so we use a 32-bit mask to match that /24 range.
+# DBL, http://www.spamhaus.org/dbl/ 
 if can(Mail::SpamAssassin::Plugin::URIDNSBL::has_tflags_domains_only)
-urirhssub       URIBL_DBL       dbl.spamhaus.org.       A   2130706688
-body            URIBL_DBL       eval:check_uridnsbl('URIBL_DBL')
-describe        URIBL_DBL       Contains an URL listed in the DBL blocklist
-tflags          URIBL_DBL       net domains_only
+urirhssub       URIBL_DBL_SPAM   dbl.spamhaus.org.       A   127.0.1.2
+body            URIBL_DBL_SPAM   eval:check_uridnsbl('URIBL_DBL_SPAM')
+describe        URIBL_DBL_SPAM   Contains an URL listed in the DBL blocklist
+tflags          URIBL_DBL_SPAM   net domains_only
+
+# this indicates that IP-address queries were sent to DBL, and should
+# never appear; if it does, something is wrong with SpamAssassin
+urirhssub       URIBL_DBL_ERROR  dbl.spamhaus.org.       A   127.0.1.255
+body            URIBL_DBL_ERROR  eval:check_uridnsbl('URIBL_DBL_ERROR')
+describe        URIBL_DBL_ERROR  Error: queried the DBL blocklist for an IP
+tflags          URIBL_DBL_ERROR  net domains_only
 endif
 
 ###########################################################################

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=920291&r1=920290&r2=920291&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Mon Mar  8 12:08:48 2010
@@ -1022,10 +1022,11 @@
 score URIBL_WS_SURBL 0 1.659 0 1.608 # n=0 n=2
 score URIBL_BLACK 0 1.775 0 1.725 # n=0 n=2
 score URIBL_GREY 0 1.084 0 0.424 # n=0 n=2
-score URIBL_DBL 0 1.7 0 1.7
+score URIBL_DBL_SPAM 0 1.7 0 1.7
 # </gen:mutable>
 # score URIBL_GREY 0.25
 score URIBL_RED 0.001
+score URIBL_DBL_ERROR 0 0.001 0 0.001
 endif # Mail::SpamAssassin::Plugin::URIDNSBL
 
 # ReplaceTags



Mime
View raw message