From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 20 Apr 2020 15:52:30 +0000 (+0100)
Subject: [Fix] Rbl: Fix ignore_defaults in conjunction with ignore_whitelists
X-Git-Tag: 2.6~508
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=913c37391f886e6b33e299f1ee8477e589182980;p=rspamd.git

[Fix] Rbl: Fix ignore_defaults in conjunction with ignore_whitelists
---

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