[Minor] Fine-tune composites

diff --git a/conf/composites.conf b/conf/composites.conf
index d2e71bedf8eafcfcb5c1eddd9ae04598d765cc58..b642014944bd46c6d0a6c04419bb0d0674f68357 100644 (file)
--- 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"