From: Frederik Bosch <f.bosch@genkgo.nl>
Date: Wed, 12 Oct 2022 09:53:44 +0000 (+0200)
Subject: Composites should not be recursive
X-Git-Tag: 3.4~41^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f03b4d1c7cd1e160305cb39914c36e54d3f434ce;p=rspamd.git

Composites should not be recursive
---

diff --git a/conf/composites.conf b/conf/composites.conf
index 543d7c46a..2952773e9 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -56,7 +56,7 @@ composites {
     description = "Authenticating message via SPF/DKIM/DMARC/ARC not available";
   }
   AUTH_NA_OR_FAIL {
-    expression = "!AUTH_NA & (R_DKIM_NA | R_DKIM_TEMPFAIL | R_DKIM_PERMFAIL) & (R_SPF_NA | R_SPF_DNSFAIL) & DMARC_NA & (ARC_NA | ARC_DNSFAIL)";
+    expression = "!(R_DKIM_NA & R_SPF_NA & DMARC_NA & ARC_NA) & (R_DKIM_NA | R_DKIM_TEMPFAIL | R_DKIM_PERMFAIL) & (R_SPF_NA | R_SPF_DNSFAIL) & DMARC_NA & (ARC_NA | ARC_DNSFAIL)";
     score = 1.0;
     policy = "remove_weight";
     description = "Authenticating message via SPF/DKIM/DMARC/ARC not available or failed";