]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] DKIM signing: allow for auth_only to be false
authorAndrew Lewis <nerf@judo.za.org>
Mon, 15 Jan 2018 15:33:48 +0000 (17:33 +0200)
committerAndrew Lewis <nerf@judo.za.org>
Wed, 24 Jan 2018 09:59:18 +0000 (11:59 +0200)
lualib/dkim_sign_tools.lua

index 4b615eae04007e9a2b026811045a93a78f16e1e9..afe34ff5787916ef1ae446e08384bff8e6beabf6 100644 (file)
@@ -30,16 +30,16 @@ local function prepare_dkim_signing(N, task, settings)
     is_local = true
   end
 
-  if settings.auth_only and not auser then
-    if (settings.sign_networks and settings.sign_networks:get_key(ip)) then
-      is_sign_networks = true
-      rspamd_logger.debugm(N, task, 'mail is from address in sign_networks')
-    elseif settings.sign_local and is_local then
-      rspamd_logger.debugm(N, task, 'mail is from local address')
-    else
-      rspamd_logger.debugm(N, task, 'ignoring unauthenticated mail')
-      return false,{}
-    end
+  if settings.auth_only and auser then
+    rspamd_logger.debugm(N, task, 'user is authenticated')
+  elseif (settings.sign_networks and settings.sign_networks:get_key(ip)) then
+    is_sign_networks = true
+    rspamd_logger.debugm(N, task, 'mail is from address in sign_networks')
+  elseif settings.sign_local and is_local then
+    rspamd_logger.debugm(N, task, 'mail is from local address')
+  else
+    rspamd_logger.debugm(N, task, 'ignoring unauthenticated mail')
+    return false,{}
   end
 
   local efrom = task:get_from('smtp')