diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-10-26 14:31:49 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-10-26 14:31:49 +0100 |
| commit | 60dd9d16581a0fb9250627ca9cf41733cb14dd69 (patch) | |
| tree | a415b06d752aefcaf0f8052f340ad3cd8d17a4a7 /src | |
| parent | 0668bd7bd4391a1c1bc786733b514c760626984b (diff) | |
| download | rspamd-60dd9d16581a0fb9250627ca9cf41733cb14dd69.tar.gz rspamd-60dd9d16581a0fb9250627ca9cf41733cb14dd69.zip | |
Remove kvstorage from the configuration as well.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cfg_utils.c | 1 | ||||
| -rw-r--r-- | src/cfg_xml.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/cfg_utils.c b/src/cfg_utils.c index 87adc7d22..52f57e07d 100644 --- a/src/cfg_utils.c +++ b/src/cfg_utils.c @@ -989,7 +989,6 @@ read_xml_config (struct config_file *cfg, const gchar *filename) ud.cfg = cfg; ud.state = 0; ctx = g_markup_parse_context_new (&xml_parser, G_MARKUP_TREAT_CDATA_AS_TEXT, &ud, NULL); - init_kvstorage_config (); res = g_markup_parse_context_parse (ctx, data, st.st_size, &err); munmap (data, st.st_size); diff --git a/src/cfg_xml.c b/src/cfg_xml.c index 7aa770267..0a2ad6821 100644 --- a/src/cfg_xml.c +++ b/src/cfg_xml.c @@ -1259,8 +1259,8 @@ rspamd_xml_text (GMarkupParseContext *context, const gchar *text, gsize text_len return; } - top = ud->parent_pointer[0]; - ud->parent_pointer[0] = + top = ud->parent_pointer[ud->nested - 1]; + ud->parent_pointer[ud->nested - 1] = ucl_object_insert_key (top, ucl_object_fromstring_common (text, text_len, UCL_STRING_PARSE), ud->section_name[ud->nested - 1], 0, true); } |