From daf9b23244e701dc20621d852cccc49b3cb8c0e8 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 3 Feb 2014 15:01:38 +0000 Subject: [PATCH] Fix classifiers config for repeated sections. --- src/cfg_rcl.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/src/cfg_rcl.c b/src/cfg_rcl.c index 0301d475f..f719e239f 100644 --- a/src/cfg_rcl.c +++ b/src/cfg_rcl.c @@ -793,12 +793,36 @@ rspamd_rcl_classifier_handler (struct config_file *cfg, ucl_object_t *obj, { ucl_object_t *val, *cur; ucl_object_iter_t it = NULL; - const gchar *key; - struct classifier_config *ccf; + const gchar *key, *type; + struct classifier_config *ccf, *found = NULL; gboolean res = TRUE; struct rspamd_rcl_section *stat_section; + GList *cur_cl; + + val = ucl_object_find_key (obj, "type"); + if (val == NULL || !ucl_object_tostring_safe (val, &type)) { + g_set_error (err, CFG_RCL_ERROR, EINVAL, "classifier should have type defined"); + return FALSE; + } + + cur_cl = cfg->classifiers; + while (cur_cl != NULL) { + ccf = cur_cl->data; + if (g_ascii_strcasecmp (ccf->classifier->name, type) == 0) { + found = ccf; + break; + } + cur_cl = g_list_next (cur_cl); + } + + if (found == NULL) { + ccf = check_classifier_conf (cfg, NULL); + ccf->classifier = get_classifier (type); + } + else { + ccf = found; + } - ccf = check_classifier_conf (cfg, NULL); HASH_FIND_STR (section->subsections, "statfile", stat_section); while ((val = ucl_iterate_object (obj, &it, true)) != NULL && res) { @@ -813,7 +837,7 @@ rspamd_rcl_classifier_handler (struct config_file *cfg, ucl_object_t *obj, } } else if (g_ascii_strcasecmp (key, "type") == 0 && val->type == UCL_STRING) { - ccf->classifier = get_classifier (ucl_object_tostring (val)); + continue; } else if (g_ascii_strcasecmp (key, "tokenizer") == 0 && val->type == UCL_STRING) { ccf->tokenizer = get_tokenizer (ucl_object_tostring (val)); @@ -825,7 +849,9 @@ rspamd_rcl_classifier_handler (struct config_file *cfg, ucl_object_t *obj, } } - cfg->classifiers = g_list_prepend (cfg->classifiers, ccf); + if (found == NULL) { + cfg->classifiers = g_list_prepend (cfg->classifiers, ccf); + } return res; -- 2.39.5