aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-30 14:01:21 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2015-06-30 14:01:21 +0100
commite8e5b8165afa39c7f1c44afcb2a4f1e96d187164 (patch)
tree06ff93c654451eef3fd1d2487db332a8b553ac2f /src
parentf49a9fcbeccbde8cd1d6dfd4706bf7de0f737e24 (diff)
parentfae7df6942e3be56a465d642b8e08d5f22eaab8e (diff)
downloadrspamd-e8e5b8165afa39c7f1c44afcb2a4f1e96d187164.tar.gz
rspamd-e8e5b8165afa39c7f1c44afcb2a4f1e96d187164.zip
Merge pull request #316 from fatalbanana/master
Fix use of RBL name as symbol; ignore RBL names that would not be yielded
Diffstat (limited to 'src')
-rw-r--r--src/plugins/lua/rbl.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index c2ec6ae3d..32e3af27a 100644
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -381,8 +381,10 @@ for key,rbl in pairs(opts['rbls']) do
end
end
end
- if not rbl['symbol'] and type(rbl['returncodes']) ~= 'nil' and not rbl['unknown'] then
- rbl['symbol'] = key
+ if not rbl['symbol'] and
+ ((rbl['returncodes'] and rbl['unknown']) or
+ (not rbl['returncodes'])) then
+ rbl['symbol'] = key
end
if type(rspamd_config.get_api_version) ~= 'nil' and rbl['symbol'] then
rspamd_config:register_virtual_symbol(rbl['symbol'], 1, id)