Mirrors/rspamd
1
0
Fork 0
mirror of https://github.com/rspamd/rspamd.git synced 2024-08-27 17:55:15 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Minor] Fix some more legacy stuff conversion

Browse Source
This commit is contained in:
Vsevolod Stakhov 2019-09-17 09:42:12 +01:00
parent d4be8b2d63
commit baa476fc09
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lualib/lua_cfg_transform.lua
View File

@ -253,10 +253,18 @@ local function surbl_section_convert(cfg, section)
end
for k,v in pairs(value) do
local skip = false
-- Rename
if k == 'suffix' then k = 'rbl' end
if k == 'ips' then k = 'returncodes' end
if k == 'bits' then k = 'returnbits' end
-- Crappy legacy
if k == 'options' then
if v == 'noip' or v == 'no_ip' then
converted.no_ip = true
skip = true
end
end
if k:match('check_') then
local n = k:match('check_(.*)')
k = n
@ -272,7 +280,9 @@ local function surbl_section_convert(cfg, section)
converted.emails_domainonly = true
end
converted[k] = lua_util.deepcopy(v)
if not skip then
converted[k] = lua_util.deepcopy(v)
end
end
rbl_section[name] = converted
end
@ -298,6 +308,7 @@ local function emails_section_convert(cfg, section)
end
for k,v in pairs(value) do
local skip = false
-- Rename
if k == 'dnsbl' then k = 'rbl' end
if k == 'check_replyto' then k = 'replyto' end
@ -310,10 +321,21 @@ local function emails_section_convert(cfg, section)
-- Hack
converted.emails = false
converted.replyto = true
skip = true
end
end
if k == 'expect_ip' then
-- Another stupid hack
if not converted.return_codes then
converted.return_codes = {}
end
local symbol = value.symbol or name
converted.return_codes[symbol] = { v }
end
converted[k] = lua_util.deepcopy(v)
if not skip then
converted[k] = lua_util.deepcopy(v)
end
end
rbl_section[name] = converted
end