From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 26 Oct 2013 13:31:49 +0000 (+0100)
Subject: Remove kvstorage from the configuration as well.
X-Git-Tag: 0.6.0~107
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=60dd9d16581a0fb9250627ca9cf41733cb14dd69;p=rspamd.git

Remove kvstorage from the configuration as well.
---

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 520acece4..51e8b218a 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -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
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);
 }