commit fe8d8e6: [Minor] Fix new greylist records case

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Dec 27 18:28:04 UTC 2018


Author: Vsevolod Stakhov
Date: 2018-12-09 11:34:02 +0000
URL: https://github.com/rspamd/rspamd/commit/fe8d8e6e2a8c108421bf9863805b6563ae3303e7

[Minor] Fix new greylist records case

---
 src/plugins/lua/greylist.lua | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index efbc31571..5a1f6c0f9 100644
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -231,13 +231,8 @@ local function greylist_check(task)
       local end_time_str
 
       if not ret_body and not ret_meta then
-        -- should never ever happen
-        local end_time = rspamd_util.get_time() + settings['timeout']
-        task:get_mempool():set_variable("grey_greylisted",
-            rspamd_util.time_to_string(end_time))
-        rspamd_logger.infox(task,
-            'greylisting record contains garbadge: %s, set end time to %s',
-            data, rspamd_util.time_to_string(end_time))
+        -- no record found
+        task:get_mempool():set_variable("grey_greylisted", 'true')
       elseif greylisted_body and greylisted_meta then
         end_time_str = rspamd_util.time_to_string(
             math.min(end_time_body, end_time_meta))


More information about the Commits mailing list