From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 30 Apr 2018 15:48:04 +0000 (+0100)
Subject: [Feature] Use scores from maps if `symbols_set` is not defined
X-Git-Tag: 1.7.4~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92cfb7f3b92813736ff949028366f989b5e5f8b1;p=rspamd.git

[Feature] Use scores from maps if `symbols_set` is not defined
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index e2c5e2f59..db80a2b65 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -505,22 +505,25 @@ local function multimap_callback(task, rule)
           return
         end
         local _,symbol,score = parse_ret(r, result)
-        if symbol and r['symbols_set'] then
-          if not r['symbols_set'][symbol] then
-            rspamd_logger.infox(task, 'symbol %s is not registered for map %s, ' ..
-              'replace it with just %s',
-              symbol, r['symbol'], r['symbol'])
-            symbol = r['symbol']
+        local forced = false
+        if symbol then
+          if r['symbols_set'] then
+            if not r['symbols_set'][symbol] then
+              rspamd_logger.infox(task, 'symbol %s is not registered for map %s, ' ..
+                  'replace it with just %s',
+                  symbol, r['symbol'], r['symbol'])
+              symbol = r['symbol']
+            end
+          else
+            forced = true
           end
-        else
-          symbol = r['symbol']
         end
 
         local opt = value_types[r['type']].get_value(value)
         if opt then
-          task:insert_result(symbol, score, opt)
+          task:insert_result(forced, symbol, score, opt)
         else
-          task:insert_result(symbol, score)
+          task:insert_result(forced, symbol, score)
         end
 
         if pre_filter then