]> source.dussan.org Git - rspamd.git/commitdiff
Remove old UCL workarounds.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 9 Feb 2015 17:24:32 +0000 (17:24 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 9 Feb 2015 17:24:32 +0000 (17:24 +0000)
src/libserver/cfg_rcl.c

index f35dee92d81c89bf59a05701b9b4175a3839e49e..4ea7c17edbc176ca10c68fea6f0920be11f7a924 100644 (file)
@@ -461,9 +461,6 @@ rspamd_rcl_metric_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
        /* Handle symbols */
        val = ucl_object_find_key (obj, "symbols");
        if (val != NULL) {
-               if (val->type == UCL_ARRAY) {
-                       val = val->value.ov;
-               }
                if (val->type != UCL_OBJECT) {
                        g_set_error (err, CFG_RCL_ERROR, EINVAL,
                                "symbols must be an object");
@@ -480,9 +477,6 @@ rspamd_rcl_metric_handler (struct rspamd_config *cfg, const ucl_object_t *obj,
                /* Legacy variant */
                val = ucl_object_find_key (obj, "symbol");
                if (val != NULL) {
-                       if (val->type == UCL_ARRAY) {
-                               val = val->value.ov;
-                       }
                        if (val->type != UCL_OBJECT) {
                                g_set_error (err,
                                        CFG_RCL_ERROR,