From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 27 Jul 2015 15:00:40 +0000 (+0100)
Subject: Support type alias for tokenizer.
X-Git-Tag: 1.0.0~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7f82c92b2fe906f3fb6337a54ffb04165e18350;p=thirdparty%2Frspamd.git

Support type alias for tokenizer.
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 13c5eb9581..b7821b7bb2 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1044,6 +1044,7 @@ rspamd_rcl_classifier_handler (rspamd_mempool_t *pool,
 				}
 				else if (g_ascii_strcasecmp (key, "tokenizer") == 0) {
 					tkcf = rspamd_mempool_alloc0 (cfg->cfg_pool, sizeof (*tkcf));
+
 					if (ucl_object_type (val) == UCL_STRING) {
 						tkcf->name = ucl_object_tostring (val);
 					}
@@ -1053,6 +1054,13 @@ rspamd_rcl_classifier_handler (rspamd_mempool_t *pool,
 							tkcf->name = ucl_object_tostring (cur);
 							tkcf->opts = val;
 						}
+						else {
+							cur = ucl_object_find_key (val, "type");
+							if (cur != NULL) {
+								tkcf->name = ucl_object_tostring (cur);
+								tkcf->opts = val;
+							}
+						}
 					}
 				}
 			}