You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2018/10/05 07:59:06 UTC

svn commit: r1842866 - /spamassassin/trunk/rules/20_dnsbl_tests.cf

Author: hege
Date: Fri Oct  5 07:59:06 2018
New Revision: 1842866

URL: http://svn.apache.org/viewvc?rev=1842866&view=rev
Log:
Revert useless priority -100, check_rbl* do not need them

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

Modified: spamassassin/trunk/rules/20_dnsbl_tests.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_dnsbl_tests.cf?rev=1842866&r1=1842865&r2=1842866&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_dnsbl_tests.cf (original)
+++ spamassassin/trunk/rules/20_dnsbl_tests.cf Fri Oct  5 07:59:06 2018
@@ -49,62 +49,52 @@ ifplugin Mail::SpamAssassin::Plugin::DNS
 header __RCVD_IN_SORBS          eval:check_rbl('sorbs', 'dnsbl.sorbs.net.')
 describe __RCVD_IN_SORBS        SORBS: sender is listed in SORBS
 tflags __RCVD_IN_SORBS          net
-priority __RCVD_IN_SORBS	-100
 reuse  __RCVD_IN_SORBS
 
 header RCVD_IN_SORBS_HTTP       eval:check_rbl_sub('sorbs', '127.0.0.2')
 describe RCVD_IN_SORBS_HTTP     SORBS: sender is open HTTP proxy server
 tflags RCVD_IN_SORBS_HTTP       net
-priority RCVD_IN_SORBS_HTTP	-100
 reuse  RCVD_IN_SORBS_HTTP
 
 header RCVD_IN_SORBS_SOCKS      eval:check_rbl_sub('sorbs', '127.0.0.3')
 describe RCVD_IN_SORBS_SOCKS    SORBS: sender is open SOCKS proxy server
 tflags RCVD_IN_SORBS_SOCKS      net
-priority RCVD_IN_SORBS_SOCKS	-100
 reuse  RCVD_IN_SORBS_SOCKS
 
 header RCVD_IN_SORBS_MISC       eval:check_rbl_sub('sorbs', '127.0.0.4')
 describe RCVD_IN_SORBS_MISC     SORBS: sender is open proxy server
 tflags RCVD_IN_SORBS_MISC       net
-priority RCVD_IN_SORBS_MISC	-100
 reuse  RCVD_IN_SORBS_MISC
 
 header RCVD_IN_SORBS_SMTP       eval:check_rbl_sub('sorbs', '127.0.0.5')
 describe RCVD_IN_SORBS_SMTP     SORBS: sender is open SMTP relay
 tflags RCVD_IN_SORBS_SMTP       net
-priority RCVD_IN_SORBS_SMTP	-100
 reuse  RCVD_IN_SORBS_SMTP
 
 # delist: $50 fee
 #header RCVD_IN_SORBS_SPAM      eval:check_rbl_sub('sorbs', '127.0.0.6')
 #describe RCVD_IN_SORBS_SPAM    SORBS: sender is a spam source
 #tflags RCVD_IN_SORBS_SPAM      net
-#priority RCVD_IN_SORBS_SPAM	-100
 #reuse  RCVD_IN_SORBS_SPAM      RCVD_IN_SORBS_SPAM
 
 header RCVD_IN_SORBS_WEB        eval:check_rbl_sub('sorbs', '127.0.0.7')
 describe RCVD_IN_SORBS_WEB      SORBS: sender is an abusable web server
 tflags RCVD_IN_SORBS_WEB        net
-priority RCVD_IN_SORBS_WEB	-100
 reuse  RCVD_IN_SORBS_WEB
 
 header RCVD_IN_SORBS_BLOCK      eval:check_rbl_sub('sorbs', '127.0.0.8')
 describe RCVD_IN_SORBS_BLOCK    SORBS: sender demands to never be tested
 tflags RCVD_IN_SORBS_BLOCK      net
-priority RCVD_IN_SORBS_BLOCK	-100
 reuse  RCVD_IN_SORBS_BLOCK
 
 header RCVD_IN_SORBS_ZOMBIE     eval:check_rbl_sub('sorbs', '127.0.0.9')
 describe RCVD_IN_SORBS_ZOMBIE   SORBS: sender is on a hijacked network
 tflags RCVD_IN_SORBS_ZOMBIE     net
-priority RCVD_IN_SORBS_ZOMBIE	-100
 reuse  RCVD_IN_SORBS_ZOMBIE
 
 header RCVD_IN_SORBS_DUL        eval:check_rbl('sorbs-lastexternal', 'dnsbl.sorbs.net.', '127.0.0.10')
 describe RCVD_IN_SORBS_DUL      SORBS: sent directly from dynamic IP address
 tflags RCVD_IN_SORBS_DUL        net
-priority RCVD_IN_SORBS_DUL	-100
 reuse  RCVD_IN_SORBS_DUL
 
 # ---------------------------------------------------------------------------
@@ -116,35 +106,30 @@ reuse  RCVD_IN_SORBS_DUL
 header __RCVD_IN_ZEN            eval:check_rbl('zen', 'zen.spamhaus.org.')
 describe __RCVD_IN_ZEN          Received via a relay in Spamhaus Zen
 tflags __RCVD_IN_ZEN            net
-priority __RCVD_IN_ZEN		-100
 reuse  __RCVD_IN_ZEN
 
 # SBL is the Spamhaus Block List: http://www.spamhaus.org/sbl/
 header RCVD_IN_SBL              eval:check_rbl_sub('zen', '127.0.0.2')
 describe RCVD_IN_SBL            Received via a relay in Spamhaus SBL
 tflags RCVD_IN_SBL              net
-priority RCVD_IN_SBL		-100
 reuse  RCVD_IN_SBL
 
 # XBL is the Exploits Block List: http://www.spamhaus.org/xbl/
 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
-priority RCVD_IN_XBL		-100
 reuse  RCVD_IN_XBL
 
 # PBL is the Policy Block List: http://www.spamhaus.org/pbl/
 header RCVD_IN_PBL              eval:check_rbl('zen-lastexternal', 'zen.spamhaus.org.', '^127\.0\.0\.1[01]$')
 describe RCVD_IN_PBL            Received via a relay in Spamhaus PBL
 tflags RCVD_IN_PBL              net
-priority RCVD_IN_PBL		-100
 reuse  RCVD_IN_PBL
 
 # CSS is the Spamhaus CSS Component of the SBL List: http://www.spamhaus.org/css/
 header RCVD_IN_SBL_CSS		eval:check_rbl_sub('zen', '127.0.0.3')
 describe RCVD_IN_SBL_CSS	Received via a relay in Spamhaus SBL-CSS
 tflags RCVD_IN_SBL_CSS		net
-priority RCVD_IN_SBL_CSS	-100
 reuse  RCVD_IN_SBL_CSS
 
 # Now, single zone BLs follow:
@@ -155,7 +140,6 @@ reuse  RCVD_IN_SBL_CSS
 header RCVD_IN_BL_SPAMCOP_NET   eval:check_rbl_txt('spamcop', 'bl.spamcop.net.', '(?i:spamcop)')
 describe RCVD_IN_BL_SPAMCOP_NET Received via a relay in bl.spamcop.net
 tflags RCVD_IN_BL_SPAMCOP_NET   net
-priority RCVD_IN_BL_SPAMCOP_NET	-100
 reuse  RCVD_IN_BL_SPAMCOP_NET
 
 # ---------------------------------------------------------------------------
@@ -164,32 +148,27 @@ reuse  RCVD_IN_BL_SPAMCOP_NET
 header RCVD_IN_MAPS_RBL         eval:check_rbl('rblplus', 'activationcode.r.mail-abuse.com.', '1')
 describe RCVD_IN_MAPS_RBL       Relay in RBL, http://www.mail-abuse.com/enduserinfo_rbl.html
 tflags RCVD_IN_MAPS_RBL         net
-priority RCVD_IN_MAPS_RBL	-100
 reuse RCVD_IN_MAPS_RBL
 
 header RCVD_IN_MAPS_DUL         eval:check_rbl('rblplus-lastexternal', 'activationcode.r.mail-abuse.com.', '2')
 describe RCVD_IN_MAPS_DUL       Relay in DUL, http://www.mail-abuse.com/enduserinfo_dul.html
 tflags RCVD_IN_MAPS_DUL         net
-priority RCVD_IN_MAPS_DUL	-100
 reuse RCVD_IN_MAPS_DUL
 
 header RCVD_IN_MAPS_RSS         eval:check_rbl_sub('rblplus', '4')
 describe RCVD_IN_MAPS_RSS       Relay in RSS, http://www.mail-abuse.com/enduserinfo_rss.html
 tflags RCVD_IN_MAPS_RSS         net
-priority RCVD_IN_MAPS_RSS	-100
 reuse RCVD_IN_MAPS_RSS
 
 header RCVD_IN_MAPS_OPS         eval:check_rbl_sub('rblplus', '8')
 describe RCVD_IN_MAPS_OPS       Relay in OPS, http://www.mail-abuse.com/enduserinfo_ops.html
 tflags RCVD_IN_MAPS_OPS         net
-priority RCVD_IN_MAPS_OPS	-100
 reuse RCVD_IN_MAPS_OPS
 
 # The NML isn't part of the RBL+ and I find any documentation for it - is it dead?
 header RCVD_IN_MAPS_NML         eval:check_rbl('nml', 'nonconfirm.mail-abuse.com.')
 describe RCVD_IN_MAPS_NML       Relay in NML, http://www.mail-abuse.com/enduserinfo_nml.html
 tflags RCVD_IN_MAPS_NML         net
-priority RCVD_IN_MAPS_NML	-100
 reuse RCVD_IN_MAPS_NML
 
 # ---------------------------------------------------------------------------
@@ -198,13 +177,11 @@ reuse RCVD_IN_MAPS_NML
 # IADB support ...
 header __RCVD_IN_IADB           eval:check_rbl('iadb-firsttrusted', 'iadb.isipp.com.')
 tflags __RCVD_IN_IADB           net nice
-priority __RCVD_IN_IADB		-100
 reuse __RCVD_IN_IADB
 
 header RCVD_IN_IADB_VOUCHED     eval:check_rbl_sub('iadb-firsttrusted', '127.0.1.255')
 describe RCVD_IN_IADB_VOUCHED   ISIPP IADB lists as vouched-for sender
 tflags RCVD_IN_IADB_VOUCHED     net nice
-priority RCVD_IN_IADB_VOUCHED	-100
 reuse RCVD_IN_IADB_VOUCHED
 
 # ---------------------------------------------------------------------------
@@ -214,7 +191,6 @@ reuse RCVD_IN_IADB_VOUCHED
 header RCVD_IN_RP_CERTIFIED     eval:check_rbl_txt('ssc-firsttrusted', 'sa-trusted.bondedsender.org.')
 describe RCVD_IN_RP_CERTIFIED   Sender in ReturnPath Certified - Contact cert-sa@returnpath.net
 tflags RCVD_IN_RP_CERTIFIED     net nice
-priority RCVD_IN_RP_CERTIFIED	-100
 reuse RCVD_IN_RP_CERTIFIED
 
 # Return Path Safe:
@@ -223,7 +199,6 @@ reuse RCVD_IN_RP_CERTIFIED
 header RCVD_IN_RP_SAFE     eval:check_rbl_txt('ssc-firsttrusted','sa-accredit.habeas.com.')
 describe RCVD_IN_RP_SAFE   Sender in ReturnPath Safe - Contact safe-sa@returnpath.net
 tflags RCVD_IN_RP_SAFE     net nice
-priority RCVD_IN_RP_SAFE   -100
 reuse RCVD_IN_RP_SAFE
 
 # Return Path Reputation Network Blacklist (RNBL):
@@ -231,7 +206,6 @@ reuse RCVD_IN_RP_SAFE
 header RCVD_IN_RP_RNBL         eval:check_rbl('rnbl-lastexternal','bl.score.senderscore.com.')
 describe RCVD_IN_RP_RNBL       Relay in RNBL, https://senderscore.org/blacklistlookup/
 tflags RCVD_IN_RP_RNBL         net
-priority RCVD_IN_RP_RNBL       -100
 reuse RCVD_IN_RP_RNBL
 
 endif