From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 5 Sep 2014 12:49:19 +0000 (+0100)
Subject: Add FORGED_SENDER_MAILLIST composite.
X-Git-Tag: 0.7.0~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dabc471756e44345a1ebe77825917002b576543f;p=thirdparty%2Frspamd.git

Add FORGED_SENDER_MAILLIST composite.
---

diff --git a/conf/composites.conf b/conf/composites.conf
index a8fe1ae4a3..abb43f5029 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -4,6 +4,10 @@ composite {
     name = "FORGED_RECIPIENTS_MAILLIST";
     expression = "FORGED_RECIPIENTS & -MAILLIST";
 }
+composite {
+    name = "FORGED_SENDER_MAILLIST";
+    expression = "FORGED_SENDER & -MAILLIST";
+}
 composite {
     name = "FORGED_MUA_OUTLOOK_MAILLIST";
     expression = "FORGED_MUA_OUTLOOK and MAILLIST";
diff --git a/conf/metrics.conf b/conf/metrics.conf
index 1d2e8ce30b..06788052af 100644
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -298,9 +298,14 @@ metric {
     }
     symbol {
         weight = 0.0;
-        description = "Recipients are not the same as RCPT TO: mail command, but from maillist";
+        description = "Recipients are not the same as RCPT TO: mail command, but a message from a maillist";
         name = "FORGED_RECIPIENTS_MAILLIST";
     }
+    symbol {
+        weight = 0.0;
+        description = "Sender is not the same as MAIL FROM: envelope, but a message is from a maillist";
+        name = "FORGED_SENDER_MAILLIST";
+    }
     symbol {
         weight = 2.0;
         description = "Forged Exchange messages ";