]> source.dussan.org Git - rspamd.git/commitdiff
Remove kvstorage from the configuration as well.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 26 Oct 2013 13:31:49 +0000 (14:31 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 26 Oct 2013 13:31:49 +0000 (14:31 +0100)
lib/CMakeLists.txt
src/cfg_utils.c
src/cfg_xml.c

index 520acece4ab317960e9e9baf16f4339933c59d53..51e8b218a91b8356ca534bafd583298c35768eb2 100644 (file)
@@ -35,10 +35,6 @@ SET(LIBRSPAMDSERVERSRC
                                ../src/dynamic_cfg.c
                                ../src/events.c
                                ../src/html.c
-                               ../src/kvstorage.c
-                               ../src/kvstorage_config.c
-                               ../src/kvstorage_file.c
-                               ../src/lmtp_proto.c
                                ../src/proxy.c
                                ../src/roll_history.c
                                ../src/settings.c
index 87adc7d22ba54d5c9f29fcb195bda48e759fe3d0..52f57e07d9b57d16244fdb0e01df275fdfb592ad 100644 (file)
@@ -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);
index 7aa770267d1ae426a9bdaa032a22f9d2f461dd66..0a2ad6821eb8a68eb8497f49f80b9967e9bb6bae 100644 (file)
@@ -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);
 }