diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-12-25 18:24:54 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2014-12-25 18:24:54 +0000 |
| commit | 83c6e88470c3858fd918f6366f251871a7cee144 (patch) | |
| tree | 727abb2ebe7bec7ed51a0fae2cac685137f395e2 /src/libserver | |
| parent | 1b448b1e355a90856c363e0fd6e00e1fa6cd7a36 (diff) | |
| download | rspamd-83c6e88470c3858fd918f6366f251871a7cee144.tar.gz rspamd-83c6e88470c3858fd918f6366f251871a7cee144.zip | |
Arrays are no longer lists in UCL.
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/cfg_rcl.c | 8 |
1 files changed, 3 insertions, 5 deletions
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) { |