From: Andrew Lewis <nerf@judo.za.org>
Date: Tue, 30 Aug 2016 20:48:13 +0000 (+0200)
Subject: [Minor] Fix forcing actions in DMARC plugin
X-Git-Tag: 1.3.5~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e72c4dd3fb0cccfda7e23294575ef2b49a9b560a;p=thirdparty%2Frspamd.git

[Minor] Fix forcing actions in DMARC plugin
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 1c290b31f3..fc85c47662 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -55,13 +55,6 @@ local elts_re = rspamd_regexp.create_cached("\\s*\\\\{0,1};\\s*")
 local dmarc_reporting = false
 local dmarc_actions = {}
 
-local function maybe_force_action(disposition)
-  local force_action = dmarc_actions[disposition]
-  if force_action then
-    task:set_pre_result(force_action, 'Action set by DMARC')
-  end
-end
-
 local function dmarc_report(task, spf_ok, dkim_ok, disposition)
   local ip = task:get_from_ip()
   if not ip:is_valid() then
@@ -75,6 +68,12 @@ local function dmarc_report(task, spf_ok, dkim_ok, disposition)
 end
 
 local function dmarc_callback(task)
+  local function maybe_force_action(disposition)
+    local force_action = dmarc_actions[disposition]
+    if force_action then
+      task:set_pre_result(force_action, 'Action set by DMARC')
+    end
+  end
   local from = task:get_from(2)
   local dmarc_domain
   local ip_addr = task:get_ip()