[Fix] First load selector_map and path_map. And only return false when domain not...

diff --git a/lualib/dkim_sign_tools.lua b/lualib/dkim_sign_tools.lua
index 0fd6f5618d8fa54730ae23bf384569d9ab1ec1ab..4b615eae04007e9a2b026811045a93a78f16e1e9 100644 (file)
--- 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