aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2020-01-26 09:23:23 +0000
committerGitHub <noreply@github.com>2020-01-26 09:23:23 +0000
commit992a147d1eeafe160811569bb3cc2e7741d4a26d (patch)
tree072750ad2021b0ab742bf85abf91b0e7c3b5195d
parent6135bc06fe43b7524f01d45f134f1a85cd4aa3f9 (diff)
parenta7e5d0b2a1b4aa57e59633f18033fe965d7f23f4 (diff)
downloadrspamd-992a147d1eeafe160811569bb3cc2e7741d4a26d.tar.gz
rspamd-992a147d1eeafe160811569bb3cc2e7741d4a26d.zip
Merge pull request #3239 from spacefreak86/bugfixes
[Minor] Bugfixes in force_action
-rw-r--r--src/plugins/lua/dmarc.lua7
-rw-r--r--src/plugins/lua/force_actions.lua4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 390abd41c..25bbc2513 100644
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -1382,6 +1382,13 @@ rspamd_config:register_symbol({
type = 'virtual'
})
rspamd_config:register_symbol({
+ name = dmarc_symbols['badpolicy'],
+ parent = id,
+ group = 'policies',
+ groups = {'dmarc'},
+ type = 'virtual'
+})
+rspamd_config:register_symbol({
name = dmarc_symbols['na'],
parent = id,
group = 'policies',
diff --git a/src/plugins/lua/force_actions.lua b/src/plugins/lua/force_actions.lua
index fb863a23b..c2a48e148 100644
--- a/src/plugins/lua/force_actions.lua
+++ b/src/plugins/lua/force_actions.lua
@@ -164,9 +164,9 @@ local function configure_module()
rspamd_config:register_dependency(t.name, a)
end
rspamd_logger.infox(rspamd_config, 'Registered symbol %1 <%2> with dependencies [%3]',
- name, expr, table.concat(atoms, ','))
+ t.name, expr, table.concat(atoms, ','))
else
- rspamd_logger.infox(rspamd_config, 'Registered symbol %1 <%2> as postfilter', name, expr)
+ rspamd_logger.infox(rspamd_config, 'Registered symbol %1 <%2> as postfilter', t.name, expr)
end
end
end