From: Andrew Lewis <nerf@judo.za.org>
Date: Mon, 11 Dec 2017 09:22:40 +0000 (+0200)
Subject: [Fix] Setting check_local / check_authed in plugins (#1954)
X-Git-Tag: 1.7.0~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8308c7983fbdefd6ba72807888b1f7403d92a8f0;p=thirdparty%2Frspamd.git

[Fix] Setting check_local / check_authed in plugins (#1954)
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index b97881f9fa..4a5a5be193 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -594,7 +594,7 @@ local function dmarc_callback(task)
 end
 
 local opts = rspamd_config:get_all_opt('options')
-if opts and type(opts) ~= 'table' then
+if type(opts) == 'table' then
   if type(opts['check_local']) == 'boolean' then
     check_local = opts['check_local']
   end
diff --git a/src/plugins/lua/hfilter.lua b/src/plugins/lua/hfilter.lua
index 0b82357198..5223941843 100644
--- a/src/plugins/lua/hfilter.lua
+++ b/src/plugins/lua/hfilter.lua
@@ -576,7 +576,7 @@ local symbols_from = {
 }
 
 local opts = rspamd_config:get_all_opt('options')
-if opts and type(opts) ~= 'table' then
+if type(opts) == 'table' then
   if type(opts['check_local']) == 'boolean' then
     check_local = opts['check_local']
   end
diff --git a/src/plugins/lua/ip_score.lua b/src/plugins/lua/ip_score.lua
index bd64ba48ff..0e9d8920e9 100644
--- a/src/plugins/lua/ip_score.lua
+++ b/src/plugins/lua/ip_score.lua
@@ -350,7 +350,7 @@ end
 -- Configuration options
 local configure_ip_score_module = function()
   local opts = rspamd_config:get_all_opt('options')
-  if opts and type(opts) ~= 'table' then
+  if type(opts) == 'table' then
     if type(opts['check_authed']) == 'boolean' then
       check_authed = opts['check_authed']
     end
diff --git a/src/plugins/lua/once_received.lua b/src/plugins/lua/once_received.lua
index d8fae5cf1f..75d551ec19 100644
--- a/src/plugins/lua/once_received.lua
+++ b/src/plugins/lua/once_received.lua
@@ -141,7 +141,7 @@ local function check_quantity_received (task)
 end
 
 local opts = rspamd_config:get_all_opt('options')
-if opts and type(opts) ~= 'table' then
+if type(opts) == 'table' then
   if type(opts['check_local']) == 'boolean' then
     check_local = opts['check_local']
   end