From: Andrew Lewis <nerf@judo.za.org>
Date: Mon, 15 Jan 2018 15:33:48 +0000 (+0200)
Subject: [Fix] DKIM signing: allow for auth_only to be false
X-Git-Tag: 1.7.0~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f1967692ce69d3a0dd97f806a41fb024ec8216e;p=thirdparty%2Frspamd.git

[Fix] DKIM signing: allow for auth_only to be false
---

diff --git a/lualib/dkim_sign_tools.lua b/lualib/dkim_sign_tools.lua
index 4b615eae04..afe34ff578 100644
--- a/lualib/dkim_sign_tools.lua
+++ b/lualib/dkim_sign_tools.lua
@@ -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')