From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 8 Jun 2017 09:17:09 +0000 (+0100)
Subject: [Minor] Use mime from/rcpt if SMTP ones are missing
X-Git-Tag: 1.6.0~44
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b12f0bd37e4b65613e2de53ca5131597d57f7603;p=rspamd.git

[Minor] Use mime from/rcpt if SMTP ones are missing
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 0a1cf15b5..e2bde2a32 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -658,12 +658,18 @@ local function multimap_callback(task, rule)
       if task:has_recipients('smtp') then
         local rcpts = task:get_recipients('smtp')
         match_addr(rule, rcpts)
+      elseif task:has_recipients('mime') then
+        local rcpts = task:get_recipients('mime')
+        match_addr(rule, rcpts)
       end
     end,
     from = function()
       if task:has_from('smtp') then
         local from = task:get_from('smtp')
         match_addr(rule, from)
+      elseif task:has_from('mime') then
+        local from = task:get_from('mime')
+        match_addr(rule, from)
       end
     end,
     helo = function()