From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 30 Jun 2015 12:34:27 +0000 (+0200)
Subject: Fix use of RBL name as symbol; ignore RBL names that would not be yielded
X-Git-Tag: 1.0.0~475^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F316%2Fhead;p=rspamd.git

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 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)