From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 21 Mar 2019 14:29:51 +0000 (+0000)
Subject: [Fix] Finally fix default parameters parsing in actions section
X-Git-Tag: 1.9.1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c77a64032de252034f06ab280e01590ef0bb4c95;p=thirdparty%2Frspamd.git

[Fix] Finally fix default parameters parsing in actions section
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 9ea80a49cf..9a2d7cd193 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -584,6 +584,21 @@ rspamd_rcl_actions_handler (rspamd_mempool_t *pool, const ucl_object_t *obj,
 					ucl_object_get_priority (cur));
 		}
 		else if (type == UCL_OBJECT || type == UCL_FLOAT || type == UCL_INT) {
+			/* Exceptions */
+			struct rspamd_rcl_default_handler_data *sec_cur, *sec_tmp;
+			gboolean default_elt = FALSE;
+
+			HASH_ITER (hh, section->default_parser, sec_cur, sec_tmp) {
+				if (strcmp (ucl_object_key (cur), sec_cur->key) == 0) {
+					default_elt = TRUE;
+				}
+			}
+
+			if (default_elt) {
+				continue;
+			}
+
+			/* Something non-default */
 			if (!rspamd_config_set_action_score (cfg,
 					ucl_object_key (cur),
 					cur)) {