You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/08/03 00:59:23 UTC

svn commit: r227105 - /spamassassin/branches/3.1/rules/20_dnsbl_tests.cf

Author: dos
Date: Tue Aug  2 15:59:22 2005
New Revision: 227105

URL: http://svn.apache.org/viewcvs?rev=227105&view=rev
Log:
bug 4502: Habeas rules have malformed calls to check_rbl() and check_rbl_sub()

Modified:
    spamassassin/branches/3.1/rules/20_dnsbl_tests.cf

Modified: spamassassin/branches/3.1/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/branches/3.1/rules/20_dnsbl_tests.cf?rev=227105&r1=227104&r2=227105&view=diff
==============================================================================
--- spamassassin/branches/3.1/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/branches/3.1/rules/20_dnsbl_tests.cf Tue Aug  2 15:59:22 2005
@@ -297,21 +297,39 @@
 
 # Habeas Accredited Senders
 #	 Last octet of the returned A record indicates the Habeas-assigned
-#	"Accreditation Level" of the Sender.
+#	"Permission Level" of the Sender.
 #		10 to 39	Personal, transactional, and Confirmed Opt In
 #		40 to 59	Secure referrals and Single Opt In
 #		60 to 99	Checked but not accredited by Habeas.
 #
 # sa-accredit.habeas.com is for SpamAssassin use.
 #
-header HABEAS_ACCREDITED_COI	eval:check_rbl('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d', 'habeas')
+header HABEAS_ACCREDITED_COI	eval:check_rbl('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d')
 describe HABEAS_ACCREDITED_COI	Habeas Accredited Confirmed Opt-In or Better
 tflags HABEAS_ACCREDITED_COI	net nice
 
-header HABEAS_ACCREDITED_SOI	eval:check_rbl_sub('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[45]\d', 'habeas')
+header HABEAS_ACCREDITED_SOI	eval:check_rbl_sub('habeas-firsttrusted', '127\.\d+\.\d+\.[45]\d')
 describe HABEAS_ACCREDITED_SOI	Habeas Accredited Opt-In or Better
 tflags HABEAS_ACCREDITED_SOI	net nice
 
-header HABEAS_CHECKED		eval:check_rbl_sub('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
+header HABEAS_CHECKED		eval:check_rbl_sub('habeas-firsttrusted', '127\.\d+\.\d+\.[6789]\d')
 describe HABEAS_CHECKED		Habeas Checked
 tflags HABEAS_CHECKED		net nice
+
+# Habeas Accredited Senders, with check for "Accreditor Assertion"
+#	Same Habeas whitelist checks as above, but performed only if the Sender
+#	has specified Habeas as their accreditor in either the EnvelopeFrom or
+#	"Accreditor" header field.  This reduces the DNS overhead, but will
+#	miss senders who are unable to add custom header fields.
+#
+# header HABEAS_ACCREDITED_COI	eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[123]\d', 'habeas')
+# describe HABEAS_ACCREDITED_COI	Habeas Accredited Confirmed Opt-In or Better
+# tflags HABEAS_ACCREDITED_COI	net nice
+# 
+# header HABEAS_ACCREDITED_SOI	eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[45]\d', 'habeas')
+# describe HABEAS_ACCREDITED_SOI	Habeas Accredited Opt-In or Better
+# tflags HABEAS_ACCREDITED_SOI	net nice
+# 
+# header HABEAS_CHECKED		eval:check_rbl_accreditor('accredit-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
+# describe HABEAS_CHECKED		Habeas Checked
+# tflags HABEAS_CHECKED		net nice