From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 14 Sep 2015 15:44:00 +0000 (+0100)
Subject: Rework dmarc to the dependencies system.
X-Git-Tag: 1.0.0~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f60551256f51150dde730f80b7e64cc976cebbc7;p=thirdparty%2Frspamd.git

Rework dmarc to the dependencies system.
---

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index ee24794dc2..9a852c3705 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -319,8 +319,12 @@ if dkim_opts then
   check_mopt('dkim_allow_symbol', 'symbol_allow')
 end
 
-rspamd_config:register_virtual_symbol('DMARC_POLICY_ALLOW', -1)
-rspamd_config:register_virtual_symbol('DMARC_POLICY_REJECT', 1)
-rspamd_config:register_virtual_symbol('DMARC_POLICY_QUARANTINE', 1)
-rspamd_config:register_virtual_symbol('DMARC_POLICY_SOFTFAIL', 1)
-rspamd_config:register_post_filter(dmarc_callback)
+local id = rspamd_config:register_callback_symbol('DMARC_CALLBACK', 1.0,
+  dmarc_callback)
+rspamd_config:register_virtual_symbol('DMARC_POLICY_ALLOW', -1, id)
+rspamd_config:register_virtual_symbol('DMARC_POLICY_REJECT', 1, id)
+rspamd_config:register_virtual_symbol('DMARC_POLICY_QUARANTINE', 1, id)
+rspamd_config:register_virtual_symbol('DMARC_POLICY_SOFTFAIL', 1, id)
+rspamd_config:register_dependency(id, opts['spf_allow_symbol'])
+rspamd_config:register_dependency(id, opts['dkim_allow_symbol'])
+