From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 25 Dec 2014 18:24:54 +0000 (+0000)
Subject: Arrays are no longer lists in UCL.
X-Git-Tag: 0.8.0~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=83c6e88470c3858fd918f6366f251871a7cee144;p=rspamd.git

Arrays are no longer lists in UCL.
---

diff --git a/contrib/snowball b/contrib/snowball
index 4bc9f365c..558c36912 160000
--- a/contrib/snowball
+++ b/contrib/snowball
@@ -1 +1 @@
-Subproject commit 4bc9f365c4b674d0dd0cfd14c314a866f00e0883
+Subproject commit 558c36912b3ca63e2917d7df504a92dbc78e1b75
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 8bc01f817..04726fbda 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -585,11 +585,8 @@ rspamd_rcl_worker_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
 
 	val = ucl_object_find_key (obj, "bind_socket");
 	if (val != NULL) {
-		if (val->type == UCL_ARRAY) {
-			val = val->value.ov;
-		}
-		LL_FOREACH (val, cur)
-		{
+		it = NULL;
+		while ((cur = ucl_iterate_object (val, &it, TRUE)) != NULL) {
 			if (!ucl_object_tostring_safe (cur, &worker_bind)) {
 				continue;
 			}
@@ -613,6 +610,7 @@ rspamd_rcl_worker_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
 	/* Parse other attributes */
 	HASH_FIND_INT (cfg->wrk_parsers, (gint *)&qtype, wparser);
 	if (wparser != NULL && obj->type == UCL_OBJECT) {
+		it = NULL;
 		while ((cur = ucl_iterate_object (obj, &it, true)) != NULL) {
 			HASH_FIND_STR (wparser->parsers, ucl_object_key (cur), whandler);
 			if (whandler != NULL) {