You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2007/01/14 15:36:06 UTC
svn commit: r496085 - in /spamassassin: rules/trunk/sandbox/dos/70_bugs.cf
trunk/rules/20_dnsbl_tests.cf
Author: jm
Date: Sun Jan 14 06:36:05 2007
New Revision: 496085
URL: http://svn.apache.org/viewvc?view=rev&rev=496085
Log:
bug 5294: RCVD_IN_XBL should use -lastexternal, not -notfirsthop
Modified:
spamassassin/rules/trunk/sandbox/dos/70_bugs.cf
spamassassin/trunk/rules/20_dnsbl_tests.cf
Modified: spamassassin/rules/trunk/sandbox/dos/70_bugs.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/dos/70_bugs.cf?view=diff&rev=496085&r1=496084&r2=496085
==============================================================================
--- spamassassin/rules/trunk/sandbox/dos/70_bugs.cf (original)
+++ spamassassin/rules/trunk/sandbox/dos/70_bugs.cf Sun Jan 14 06:36:05 2007
@@ -41,9 +41,10 @@
describe T_E_RCVD_IN_SORBS_DUL SORBS: sent directly from dynamic IP address
tflags T_E_RCVD_IN_SORBS_DUL net
-header T_E_RCVD_IN_XBL eval:check_rbl('sblxbl-lastexternal', 'sbl-xbl.spamhaus.org.', '127.0.0.[456]')
-describe T_E_RCVD_IN_XBL Received via a relay in Spamhaus XBL
-tflags T_E_RCVD_IN_XBL net
+# applied as part of bug 5294
+# header T_E_RCVD_IN_XBL eval:check_rbl('sblxbl-lastexternal', 'sbl-xbl.spamhaus.org.', '127.0.0.[456]')
+# describe T_E_RCVD_IN_XBL Received via a relay in Spamhaus XBL
+# tflags T_E_RCVD_IN_XBL net
header T_E_RCVD_IN_WHOIS_INVALID eval:check_rbl('whois-lastexternal', 'combined-HIB.dnsiplists.completewhois.com.', '127.0.0.4')
describe T_E_RCVD_IN_WHOIS_INVALID CompleteWhois: sender on invalid IP block
Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?view=diff&rev=496085&r1=496084&r2=496085
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Sun Jan 14 06:36:05 2007
@@ -151,7 +151,7 @@
#reuse RCVD_IN_SBL
# XBL is the Exploits Block List: http://www.spamhaus.org/xbl/
-header RCVD_IN_XBL eval:check_rbl('zen-notfirsthop', 'zen.spamhaus.org.', '127.0.0.[45678]')
+header RCVD_IN_XBL eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '127.0.0.[45678]')
describe RCVD_IN_XBL Received via a relay in Spamhaus XBL
tflags RCVD_IN_XBL net
#reuse RCVD_IN_XBL