From: AL <AlexeySa@users.noreply.github.com>
Date: Thu, 27 Oct 2016 13:06:31 +0000 (+0300)
Subject: Another way for  greylist "MX_INVALID" message
X-Git-Tag: 1.4.0~177^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1076%2Fhead;p=thirdparty%2Frspamd.git

Another way for  greylist "MX_INVALID" message
---

diff --git a/src/plugins/lua/mx_check.lua b/src/plugins/lua/mx_check.lua
index e92a5e7fa0..be13a1322d 100644
--- a/src/plugins/lua/mx_check.lua
+++ b/src/plugins/lua/mx_check.lua
@@ -68,14 +68,15 @@ local function mx_check(task)
         end
       end
       if not valid then
-        task:insert_result(settings.symbol_bad_mx, 1.0)
         -- Greylist message
         if settings.greylist_invalid then
           local grey_is_whitelisted = task:get_mempool():get_variable("grey_whitelisted")
           if not grey_is_whitelisted then
-            local end_time = rspamd_util.time_to_string(rspamd_util.get_time() + 3600)
-            task:get_mempool():set_variable("grey_greylisted", end_time)
+            task:get_mempool():set_variable("grey_greylisted_required", "1")
+            task:insert_result(settings.symbol_bad_mx, 1.0, "greylisted")
           end
+        else
+          task:insert_result(settings.symbol_bad_mx, 1.0)
         end
         local ret,_,_ = rspamd_redis_make_request(task,
           redis_params, -- connect params