From: Alexey AL <AlexeySa@users.noreply.github.com>
Date: Sun, 21 Aug 2016 11:52:41 +0000 (+0300)
Subject: Update composites.conf
X-Git-Tag: 1.3.4~16^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7ffc7a9c64e34c638e9b2b05b8012d6d32f56cab;p=rspamd.git

Update composites.conf
---

diff --git a/conf/composites.conf b/conf/composites.conf
index 23c19cded..f57c2fad0 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -24,7 +24,7 @@ composite "FORGED_SENDER_FORWARDING" {
     expression = "FORGED_SENDER & g:forwarding";
 }
 composite "FORWARDING_MAILRU" {
-    expression = "FWD_MAILRU & (R_SPF_SOFTFAIL | R_SPF_FAIL)";
+    expression = "FWD_MAILRU | (FWD_MAILRU & (R_SPF_SOFTFAIL | R_SPF_FAIL))";
 }
 composite "FORGED_SENDER_VERP_SRS" {
     expression = "FORGED_SENDER & (ENVFROM_PRVS | ENVFROM_VERP)";