From: Andrew Lewis <nerf@judo.za.org>
Date: Thu, 22 Dec 2016 10:17:36 +0000 (+0200)
Subject: [Feature] Add mechanism for disabling composites (Fixes #1270)
X-Git-Tag: 1.5.0~495^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F1278%2Fhead;p=rspamd.git

[Feature] Add mechanism for disabling composites (Fixes #1270)
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 6f9e66d5c..dfd1b4c0a 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1414,6 +1414,12 @@ rspamd_rcl_composite_handler (rspamd_mempool_t *pool,
 
 	composite_name = key;
 
+	val = ucl_object_lookup (obj, "enabled");
+	if (val != NULL && !ucl_object_toboolean (val)) {
+		msg_info_config ("composite %s is disabled", composite_name);
+		return TRUE;
+	}
+
 	if (g_hash_table_lookup (cfg->composite_symbols, composite_name) != NULL) {
 		msg_warn_config ("composite %s is redefined", composite_name);
 		new = FALSE;