From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 8 Sep 2016 14:41:27 +0000 (+0200)
Subject: [Minor] Fine-tune composites
X-Git-Tag: 1.4.0~463^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=032de97d723dd030734b9abdb49c829be080a0b7;p=rspamd.git

[Minor] Fine-tune composites
---

diff --git a/conf/composites.conf b/conf/composites.conf
index d2e71bedf..b64201494 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -28,6 +28,7 @@ composite "SPF_FAIL_FORWARDING" {
 }
 composite "DMARC_POLICY_ALLOW_WITH_FAILURES" {
     expression = "DMARC_POLICY_ALLOW & (R_SPF_SOFTFAIL | R_SPF_FAIL | R_DKIM_REJECT)";
+    policy = "remove_weight";
 }
 composite "FORGED_RECIPIENTS_FORWARDING" {
     expression = "FORGED_RECIPIENTS & g:forwarding";
@@ -39,11 +40,12 @@ composite "FORGED_MUA_MAILLIST" {
     expression = "g:mua and -MAILLIST";
 }
 composite "RBL_SPAMHAUS_XBL_ANY" {
-    expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL";
+    expression = "RBL_SPAMHAUS_XBL & RECEIVED_SPAMHAUS_XBL";
 }
 composite "AUTH_NA" {
     expression = "R_DKIM_NA & R_SPF_NA & DMARC_NA";
     score = 1.0;
+    policy = "remove_weight";
 }
 
 .include(try=true; priority=1; duplicate=merge) "$LOCAL_CONFDIR/local.d/composites.conf"