From 86693e995a087dfb08e9e9b4dd45942468c3b620 Mon Sep 17 00:00:00 2001 From: Jean-Louis Dupond Date: Fri, 11 Aug 2017 23:20:37 +0200 Subject: [PATCH] [Fix] First load selector_map and path_map. And only return false when domain not found if try_fallback is false --- lualib/dkim_sign_tools.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lualib/dkim_sign_tools.lua b/lualib/dkim_sign_tools.lua index 0fd6f5618..4b615eae0 100644 --- a/lualib/dkim_sign_tools.lua +++ b/lualib/dkim_sign_tools.lua @@ -156,21 +156,12 @@ local function prepare_dkim_signing(N, task, settings) end end - if not p.key then - if not settings.use_redis then - p.key = settings.path - end - end - - if not p.selector then - p.selector = settings.selector - end - p.domain = dkim_domain - if not p.selector and settings.selector_map then local data = settings.selector_map:get_key(dkim_domain) if data then p.selector = data + elseif not settings.try_fallback then + return false,{} end end @@ -178,11 +169,22 @@ local function prepare_dkim_signing(N, task, settings) local data = settings.path_map:get_key(dkim_domain) if data then p.key = data - else + elseif not settings.try_fallback then return false,{} end end + if not p.key then + if not settings.use_redis then + p.key = settings.path + end + end + + if not p.selector then + p.selector = settings.selector + end + p.domain = dkim_domain + return true,p end -- 2.39.5