From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 13 Nov 2020 11:21:53 +0000 (+0000)
Subject: [Minor] Rbl: Workaround for 'rules'
X-Git-Tag: 2.7~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4d8063ebb915a7c1fd50e6b207d78e13fd8db3f;p=thirdparty%2Frspamd.git

[Minor] Rbl: Workaround for 'rules'
---

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index 7828d74d17..534a4855bd 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -1119,12 +1119,18 @@ end
 
 opts = lua_util.override_defaults(rbl_common.default_options, opts)
 
+if opts.rules and opts.rbls then
+  -- Common issue :(
+  rspamd_logger.infox(rspamd_config, 'merging `rules` and `rbls` keys for compatibility')
+  opts.rbls = lua_util.override_defaults(opts.rbls, opts.rules)
+end
+
 if(opts['local_exclude_ip_map'] ~= nil) then
   local_exclusions = lua_maps.map_add(N, 'local_exclude_ip_map', 'radix',
     'RBL exclusions map')
 end
 
-for key,rbl in pairs(opts.rbls or opts.rules) do
+for key,rbl in pairs(opts.rbls ) do
   if type(rbl) ~= 'table' or rbl.disabled == true or rbl.enabled == false then
     rspamd_logger.infox(rspamd_config, 'disable rbl "%s"', key)
   else