aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2020-04-20 16:52:30 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2020-04-20 16:52:30 +0100
commit913c37391f886e6b33e299f1ee8477e589182980 (patch)
tree1a601a18a49e9d0a8662d3c5af3f56f35b4c0ef3 /src/plugins
parent9d44d461ab06c26b1483392714fabdb0dcad68be (diff)
downloadrspamd-913c37391f886e6b33e299f1ee8477e589182980.tar.gz
rspamd-913c37391f886e6b33e299f1ee8477e589182980.zip
[Fix] Rbl: Fix ignore_defaults in conjunction with ignore_whitelists
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/lua/rbl.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index ff8b6a700..d82a89948 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -954,7 +954,7 @@ local function add_rbl(key, rbl, global_opts)
name = prefix .. '_' .. rbl.symbol,
}
end
- if not rbl.is_whitelist and rbl.ignore_whitelist == false then
+ if not (rbl.is_whitelist or rbl.ignore_whitelist) then
table.insert(black_symbols, rbl.symbol .. '_CHECK')
else
lua_util.debugm(N, rspamd_config, 'rule %s ignores whitelists: rbl.is_whitelist = %s, ' ..
@@ -968,7 +968,7 @@ local function add_rbl(key, rbl, global_opts)
name = rbl.symbol,
flags = table.concat(flags_tbl, ',')
}
- if not rbl.is_whitelist and rbl.ignore_whitelist == false then
+ if not (rbl.is_whitelist or rbl.ignore_whitelist) then
table.insert(black_symbols, rbl.symbol)
else
lua_util.debugm(N, rspamd_config, 'rule %s ignores whitelists: rbl.is_whitelist = %s, ' ..
@@ -1022,7 +1022,7 @@ local function add_rbl(key, rbl, global_opts)
table.insert(white_symbols, s)
end
else
- if rbl.ignore_whitelist == false then
+ if not rbl.ignore_whitelist then
table.insert(black_symbols, s)
end
end