Fix use of RBL name as symbol; ignore RBL names that would not be yielded

diff --git a/src/plugins/lua/rbl.lua b/src/plugins/lua/rbl.lua
index b93a30454f61cbd580324c41238b32e91fb2d2e3..430282a8d9976389c285fd17bd4a9da7ad131f60 100644 (file)
--- a/src/plugins/lua/rbl.lua
+++ b/src/plugins/lua/rbl.lua
@@ -379,8 +379,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)