aboutsummaryrefslogtreecommitdiffstats
path: root/lualib/lua_dkim_tools.lua
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2019-05-31 16:40:52 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2019-05-31 16:40:52 +0100
commit935e7918e6066304023c82887e4d07965f1268f2 (patch)
treedf63e87bf8669b2dbe1fc41596a3cd964b7ca412 /lualib/lua_dkim_tools.lua
parent5b1a3846ec7721bc9184c83d83bd75b2c8f0a006 (diff)
downloadrspamd-935e7918e6066304023c82887e4d07965f1268f2.tar.gz
rspamd-935e7918e6066304023c82887e4d07965f1268f2.zip
[Minor] Compat: Allow to use old style sign_condition
Diffstat (limited to 'lualib/lua_dkim_tools.lua')
-rw-r--r--lualib/lua_dkim_tools.lua9
1 files changed, 7 insertions, 2 deletions
diff --git a/lualib/lua_dkim_tools.lua b/lualib/lua_dkim_tools.lua
index fbb071245..4ca1a662f 100644
--- a/lualib/lua_dkim_tools.lua
+++ b/lualib/lua_dkim_tools.lua
@@ -142,7 +142,11 @@ local function prepare_dkim_signing(N, task, settings)
return false,{}
end
- return true,ret
+ if ret[1] then
+ return true,ret
+ else
+ return true,{ret}
+ end
end
local auser = task:get_user()
@@ -666,7 +670,8 @@ exports.validate_signing_settings = function(settings)
settings.selector_map or
settings.use_http_headers or
(settings.signing_table and settings.key_table) or
- (settings.use_vault and settings.vault_url and settings.vault_token)
+ (settings.use_vault and settings.vault_url and settings.vault_token) or
+ settings.sign_condition
end
exports.process_signing_settings = function(N, settings, opts)