From 0ef1d963c792172f5ffe68cbfc1002c3ae66aaa7 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 13 Aug 2015 15:32:12 +0100 Subject: [PATCH] Weight is an alias for scores symbols. --- src/libserver/cfg_rcl.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c index def4ac4b3..94817d8c6 100644 --- a/src/libserver/cfg_rcl.c +++ b/src/libserver/cfg_rcl.c @@ -352,7 +352,7 @@ rspamd_rcl_symbol_handler (rspamd_mempool_t *pool, const ucl_object_t *obj, return FALSE; } - if (ucl_object_find_key (obj, "score") != NULL) { + if (ucl_object_find_any_key (obj, "score", "weight", NULL) != NULL) { *sym_def->weight_ptr = sym_def->score; } @@ -1417,6 +1417,11 @@ rspamd_rcl_config_init (void) rspamd_rcl_parse_struct_double, G_STRUCT_OFFSET (struct rspamd_symbol_def, score), 0); + rspamd_rcl_add_default_handler (ssub, + "weight", + rspamd_rcl_parse_struct_double, + G_STRUCT_OFFSET (struct rspamd_symbol_def, score), + 0); /* Actions part */ ssub = rspamd_rcl_add_section (&sub->subsections, @@ -1471,6 +1476,11 @@ rspamd_rcl_config_init (void) rspamd_rcl_parse_struct_double, G_STRUCT_OFFSET (struct rspamd_symbol_def, score), 0); + rspamd_rcl_add_default_handler (sssub, + "weight", + rspamd_rcl_parse_struct_double, + G_STRUCT_OFFSET (struct rspamd_symbol_def, score), + 0); /** * Worker section -- 2.39.5