From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 29 Aug 2015 16:33:26 +0000 (+0100)
Subject: Fix logging tags for maps.
X-Git-Tag: 1.0.0~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e15ccc0ad087b016865dc2fdd3bc13ccb5f8373;p=thirdparty%2Frspamd.git

Fix logging tags for maps.
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index cddf044a9b..ec6e1f7eb0 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -2409,6 +2409,9 @@ rspamd_config_read (struct rspamd_config *cfg, const gchar *filename,
 
 	blake2b (cksumbuf, data, NULL, sizeof (cksumbuf), st.st_size, 0);
 	cfg->checksum = rspamd_encode_base32 (cksumbuf, sizeof (cksumbuf));
+	/* Also change the tag of cfg pool to be equal to the checksum */
+	rspamd_strlcpy (cfg->cfg_pool->tag.uid, cfg->checksum,
+			MIN (sizeof (cfg->cfg_pool->tag.uid), strlen (cfg->checksum)));
 
 	parser = ucl_parser_new (0);
 	rspamd_ucl_add_conf_variables (parser, vars);
diff --git a/src/libutil/map.c b/src/libutil/map.c
index 8d9dbb3a19..10f5d53ce9 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -486,8 +486,12 @@ rspamd_map_add (struct rspamd_config *cfg,
 	}
 	/* Constant pool */
 	if (cfg->map_pool == NULL) {
-		cfg->map_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (), NULL);
+		cfg->map_pool = rspamd_mempool_new (rspamd_mempool_suggest_size (),
+				"map");
+		memcpy (cfg->map_pool->tag.uid, cfg->cfg_pool->tag.uid,
+				sizeof (cfg->map_pool->tag.uid));
 	}
+
 	new_map = rspamd_mempool_alloc0 (cfg->map_pool, sizeof (struct rspamd_map));
 	new_map->read_callback = read_callback;
 	new_map->fin_callback = fin_callback;