Diff of /spamassassin/trunk/rules/20_dnsbl_tests.cf

Parent Directory | Revision Log | Patch

--- spamassassin/trunk/rules/20_dnsbl_tests.cf	2005/06/20 02:54:48	191378
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf	2005/06/20 03:00:40	191379
@@ -295,23 +295,6 @@ tflags RCVD_IN_IADB_VOUCHED	net nice
 
 # ---------------------------------------------------------------------------
 
-# Habeas Legacy support: the Habeas Infringers blocklist.
-# sa-hil.habeas.com for SpamAssassin queries
-# hil.habeas.com for other queries
-header HABEAS_INFRINGER		eval:check_rbl_swe('hil', 'sa-hil.habeas.com.')
-describe HABEAS_INFRINGER	Has Habeas warrant mark and on Infringer List
-tflags HABEAS_INFRINGER		net
-#reuse HABEAS_INFRINGER
-
-# Habeas Legacy support: the Habeas Users whitelist.  This list contains users
-# from accredit.habeas.com at "accreditation level" 10 to 39.
-# sa-hul.habeas.com for SpamAssassin queries
-# hul.habeas.com for other queries
-header HABEAS_USER		eval:check_rbl_swe('hul-firsttrusted', 'sa-hul.habeas.com.')
-describe HABEAS_USER		Has Habeas warrant mark and on User List
-tflags HABEAS_USER		net nice
-#reuse HABEAS_USER
-
 # Habeas Accredited Senders
 #	 Last octet of the returned A record indicates the Habeas-assigned
 #	"Accreditation Level" of the Sender.
@@ -321,16 +304,14 @@ tflags HABEAS_USER		net nice
 #
 # sa-accredit.habeas.com is for SpamAssassin use.
 #
-header HABEAS_ACCREDITED_COI	eval:check_rbl_accreditor('accredit-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', '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')
+header HABEAS_ACCREDITED_SOI	eval:check_rbl_sub('habeas-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')
+header HABEAS_CHECKED		eval:check_rbl_sub('habeas-firsttrusted', 'sa-accredit.habeas.com.', '127\.\d+\.\d+\.[6789]\d', 'habeas')
 describe HABEAS_CHECKED		Habeas Checked
 tflags HABEAS_CHECKED		net nice
-
-