From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 9 May 2015 21:55:52 +0000 (+0100)
Subject: Add configuration alias to avoid ambiguity.
X-Git-Tag: 0.9.0~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfacc06c519b4fedb6260b2a3b8e789cf9137273;p=thirdparty%2Frspamd.git

Add configuration alias to avoid ambiguity.
---

diff --git a/src/plugins/dkim_check.c b/src/plugins/dkim_check.c
index 3f7a2ae9a3..073bb347f9 100644
--- a/src/plugins/dkim_check.c
+++ b/src/plugins/dkim_check.c
@@ -173,6 +173,18 @@ dkim_module_config (struct rspamd_config *cfg)
 			got_trusted = TRUE;
 		}
 	}
+	if (!got_trusted && (value =
+			rspamd_config_get_module_opt (cfg, "dkim", "trusted_domains")) != NULL) {
+		if (!rspamd_map_add (cfg, ucl_obj_tostring (value),
+				"DKIM domains", rspamd_kv_list_read, rspamd_kv_list_fin,
+				(void **)&dkim_module_ctx->dkim_domains)) {
+			msg_warn ("cannot load dkim domains list from %s",
+					ucl_obj_tostring (value));
+		}
+		else {
+			got_trusted = TRUE;
+		}
+	}
 	if ((value =
 		rspamd_config_get_module_opt (cfg, "dkim",
 		"strict_multiplier")) != NULL) {