]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
Support type alias for tokenizer.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 27 Jul 2015 15:00:40 +0000 (16:00 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 27 Jul 2015 15:00:40 +0000 (16:00 +0100)
src/libserver/cfg_rcl.c

index 13c5eb958135ed608be26facb32d39a4a8e22d14..b7821b7bb2786b37a7bf467c5c795c5796e56125 100644 (file)
@@ -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;
+                                                       }
+                                               }
                                        }
                                }
                        }