From f60551256f51150dde730f80b7e64cc976cebbc7 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 14 Sep 2015 16:44:00 +0100 Subject: [PATCH] Rework dmarc to the dependencies system. --- src/plugins/lua/dmarc.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index ee24794dc..9a852c370 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']) + -- 2.39.5