From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 3 Oct 2018 12:25:31 +0000 (+0100)
Subject: [Fix] Fix dependencies for DNS_SIGNED symbol
X-Git-Tag: 1.8.1~98
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ef527ac2683c77628210c0ea0a62a19335cf213;p=rspamd.git

[Fix] Fix dependencies for DNS_SIGNED symbol
---

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