From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 31 Jul 2020 20:06:11 +0000 (+0100)
Subject: [Minor] Dmarc: Least flag aleady implies the intended behaviour
X-Git-Tag: 2.6~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77045b2a870f1968fb0f74789cbe7292039293af;p=thirdparty%2Frspamd.git

[Minor] Dmarc: Least flag aleady implies the intended behaviour
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 038a7de5db..eea0e795d0 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -230,8 +230,7 @@ local function maybe_force_action(task, disposition)
   if disposition then
     local force_action = dmarc_actions[disposition]
     if force_action then
-      -- Don't do anything if pre-result has been already set
-      if task:has_pre_result() then return end
+      -- Set least action
       task:set_pre_result(force_action, 'Action set by DMARC', N, nil, nil, 'least')
     end
   end