aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-10-03 13:25:31 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-10-03 13:30:04 +0100
commit0ef527ac2683c77628210c0ea0a62a19335cf213 (patch)
tree3dfc36346a16d2d1cc1b6db87a229efbf8a111fc /src/plugins
parent2f00b1fc24b7fe48a19c3a778f023645c149ba0e (diff)
downloadrspamd-0ef527ac2683c77628210c0ea0a62a19335cf213.tar.gz
rspamd-0ef527ac2683c77628210c0ea0a62a19335cf213.zip
[Fix] Fix dependencies for DNS_SIGNED symbol
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/dkim_check.c59
-rw-r--r--src/plugins/lua/dkim_signing.lua3
2 files changed, 36 insertions, 26 deletions
diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index f728fb5ec..1784612f0 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -499,36 +499,43 @@ dkim_module_config (struct rspamd_config *cfg)
}
cb_id = rspamd_symbols_cache_add_symbol (cfg->cache,
- dkim_module_ctx->symbol_reject,
- 0,
- dkim_symbol_callback,
- NULL,
- SYMBOL_TYPE_NORMAL|SYMBOL_TYPE_FINE,
- -1);
+ "DKIM_CHECK",
+ 0,
+ dkim_symbol_callback,
+ NULL,
+ SYMBOL_TYPE_CALLBACK,
+ -1);
rspamd_symbols_cache_add_symbol (cfg->cache,
- dkim_module_ctx->symbol_na,
- 0,
- NULL, NULL,
- SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
- cb_id);
+ dkim_module_ctx->symbol_reject,
+ 0,
+ NULL,
+ NULL,
+ SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
+ cb_id);
rspamd_symbols_cache_add_symbol (cfg->cache,
- dkim_module_ctx->symbol_permfail,
- 0,
- NULL, NULL,
- SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
- cb_id);
+ dkim_module_ctx->symbol_na,
+ 0,
+ NULL, NULL,
+ SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
+ cb_id);
rspamd_symbols_cache_add_symbol (cfg->cache,
- dkim_module_ctx->symbol_tempfail,
- 0,
- NULL, NULL,
- SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
- cb_id);
+ dkim_module_ctx->symbol_permfail,
+ 0,
+ NULL, NULL,
+ SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
+ cb_id);
rspamd_symbols_cache_add_symbol (cfg->cache,
- dkim_module_ctx->symbol_allow,
- 0,
- NULL, NULL,
- SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
- cb_id);
+ dkim_module_ctx->symbol_tempfail,
+ 0,
+ NULL, NULL,
+ SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
+ cb_id);
+ rspamd_symbols_cache_add_symbol (cfg->cache,
+ dkim_module_ctx->symbol_allow,
+ 0,
+ NULL, NULL,
+ SYMBOL_TYPE_VIRTUAL|SYMBOL_TYPE_FINE,
+ cb_id);
rspamd_symbols_cache_add_symbol (cfg->cache,
"DKIM_TRACE",
diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
index f15816afd..8d621bbb2 100644
--- a/src/plugins/lua/dkim_signing.lua
+++ b/src/plugins/lua/dkim_signing.lua
@@ -221,3 +221,6 @@ rspamd_config:register_symbol({
groups = {"policies", "dkim"},
score = 0.0,
})
+
+-- Add dependency on DKIM checks
+rspamd_config:register_dependency(settings['symbol'], 'DKIM_CHECK') \ No newline at end of file