From: Alexey AL <AlexeySa@users.noreply.github.com>
Date: Sun, 21 Aug 2016 11:54:09 +0000 (+0300)
Subject: Update composites.conf
X-Git-Tag: 1.3.4~16^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03ceb655ecb249b295d0863ac3cdc46ac9d35b4a;p=thirdparty%2Frspamd.git

Update composites.conf
---

diff --git a/conf/composites.conf b/conf/composites.conf
index f57c2fad0f..ee8c83ea7d 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 | (FWD_MAILRU & (R_SPF_SOFTFAIL | R_SPF_FAIL))";
+    expression = "(FWD_MAILRU & (R_SPF_SOFTFAIL | R_SPF_FAIL)) | FWD_MAILRU";
 }
 composite "FORGED_SENDER_VERP_SRS" {
     expression = "FORGED_SENDER & (ENVFROM_PRVS | ENVFROM_VERP)";