You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2022/05/12 14:25:12 UTC

svn commit: r1900839 - in /spamassassin/trunk/rules: 25_dmarc.cf 50_scores.cf

Author: gbechis
Date: Thu May 12 14:25:12 2022
New Revision: 1900839

URL: http://svn.apache.org/viewvc?rev=1900839&view=rev
Log:
set DMARC_PASS and DMARC_MISSING rules as immutable

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

Modified: spamassassin/trunk/rules/25_dmarc.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/25_dmarc.cf?rev=1900839&r1=1900838&r2=1900839&view=diff
==============================================================================
--- spamassassin/trunk/rules/25_dmarc.cf (original)
+++ spamassassin/trunk/rules/25_dmarc.cf Thu May 12 14:25:12 2022
@@ -32,36 +32,31 @@ header DMARC_PASS eval:check_dmarc_pass(
 describe DMARC_PASS DMARC pass policy
 priority DMARC_PASS 500
 tflags DMARC_PASS net nice
-score DMARC_PASS -0.001
 reuse DMARC_PASS
 
 header DMARC_REJECT eval:check_dmarc_reject()
 describe DMARC_REJECT DMARC reject policy
 priority DMARC_REJECT 500
 tflags DMARC_REJECT net
-score DMARC_REJECT 0.001
 reuse DMARC_REJECT
 
 header DMARC_QUAR eval:check_dmarc_quarantine()
 describe DMARC_QUAR DMARC quarantine policy
 priority DMARC_QUAR 500
 tflags DMARC_QUAR net
-score DMARC_QUAR 0.001
 reuse DMARC_QUAR
 
 header DMARC_NONE eval:check_dmarc_none()
 describe DMARC_NONE DMARC none policy
 priority DMARC_NONE 500
 tflags DMARC_NONE net
-score DMARC_NONE 0.001
 reuse DMARC_NONE
 
 header DMARC_MISSING eval:check_dmarc_missing()
 describe DMARC_MISSING Missing DMARC policy
 priority DMARC_MISSING 500
 tflags DMARC_MISSING net
-score DMARC_MISSING 0.001
 reuse DMARC_MISSING
- 
+
 endif
 

Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1900839&r1=1900838&r2=1900839&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Thu May 12 14:25:12 2022
@@ -783,6 +783,17 @@ score SPF_SOFTFAIL 0 0.972 0 0.665 # n=0
 # </gen:mutable>
 endif # Mail::SpamAssassin::Plugin::SPF
 
+# DMARC
+ifplugin Mail::SpamAssassin::Plugin::DMARC
+score DMARC_PASS -0.001
+# <gen:mutable>
+score DMARC_REJECT 0.001 1.797 0.001 1.797 # n=0 n=2
+score DMARC_QUAR 0.001 1.198 0.001 1.198 # n=0 n=2
+score DMARC_NONE 0.001 0.898 0.001 0.898 # n=0 n=2
+# </gen:mutable>
+score DMARC_MISSING 0.001
+endif # Mail::SpamAssassin::Plugin::DMARC
+
 # URIDNSBL
 ifplugin Mail::SpamAssassin::Plugin::URIDNSBL
 # <gen:mutable>