From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 17 Nov 2016 18:10:23 +0000 (+0000)
Subject: [Minor] Allow `rules` alias for consistency in SURBL
X-Git-Tag: 1.4.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b57850ce5b78737273e7c202e8eb1ecb26e9f3a;p=thirdparty%2Frspamd.git

[Minor] Allow `rules` alias for consistency in SURBL
---

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index 1ad09e6494..f364ce64d5 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -775,6 +775,18 @@ surbl_module_config (struct rspamd_config *cfg)
 			}
 		}
 	}
+
+	value = rspamd_config_get_module_opt (cfg, "surbl", "rules");
+	if (value != NULL && value->type == UCL_OBJECT) {
+		ucl_object_iter_t it = NULL;
+		const ucl_object_t *cur_value;
+
+		/* New style only */
+		while ((cur_value = ucl_object_iterate (value, &it, true)) != NULL) {
+			nrules += surbl_module_parse_rule (cur_value, cfg, monitored_opts);
+		}
+	}
+
 	/* Add default suffix */
 	if (surbl_module_ctx->suffixes == NULL) {
 		msg_err_config ("surbl module loaded but no suffixes defined, skip "