From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 7 Jul 2018 12:32:32 +0000 (+0100)
Subject: [Feature] Reuse maps in multimap module more aggressively
X-Git-Tag: 1.7.8~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b6e9116cb35304948332c5d70bb74cf9451b612;p=rspamd.git

[Feature] Reuse maps in multimap module more aggressively
---

diff --git a/src/plugins/lua/multimap.lua b/src/plugins/lua/multimap.lua
index 8a2b21ddf..18a66a23f 100644
--- a/src/plugins/lua/multimap.lua
+++ b/src/plugins/lua/multimap.lua
@@ -895,8 +895,8 @@ local function add_multimap_rule(key, newrule)
   else
     if type(newrule['map']) == 'string' then
       local map = urls[newrule['map']]
-      if map and map['type'] == newrule['type']
-        and map['regexp'] == newrule['regexp'] then
+      if map and map['regexp'] == newrule['regexp'] and
+          map['glob'] == newrule['glob'] then
         if newrule['type'] == 'ip' then
           newrule['radix'] = map['map']
         else