From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 9 Jan 2017 16:37:31 +0000 (+0000)
Subject: [Minor] Add id for each rspamd map backend
X-Git-Tag: 1.5.0~396
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec2b296b1ac0bede84949b3d61eac538ba9d239f;p=thirdparty%2Frspamd.git

[Minor] Add id for each rspamd map backend
---

diff --git a/src/libutil/map.c b/src/libutil/map.c
index 439a13e949..22e78c097c 100644
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -1453,6 +1453,8 @@ rspamd_map_parse_backend (struct rspamd_config *cfg, const gchar *map_line)
 		bk->data.hd = hdata;
 	}
 
+	bk->id = rspamd_random_uint64_fast ();
+
 	return bk;
 
 err:
@@ -1511,7 +1513,7 @@ rspamd_map_add (struct rspamd_config *cfg,
 	map->fin_callback = fin_callback;
 	map->user_data = user_data;
 	map->cfg = cfg;
-	map->id = g_random_int ();
+	map->id = rspamd_random_uint64_fast ();
 	map->locked =
 		rspamd_mempool_alloc0_shared (cfg->cfg_pool, sizeof (gint));
 	map->cache =
@@ -1559,7 +1561,7 @@ rspamd_map_add_from_ucl (struct rspamd_config *cfg,
 	map->fin_callback = fin_callback;
 	map->user_data = user_data;
 	map->cfg = cfg;
-	map->id = g_random_int ();
+	map->id = rspamd_random_uint64_fast ();
 	map->locked =
 			rspamd_mempool_alloc0_shared (cfg->cfg_pool, sizeof (gint));
 	map->cache =
diff --git a/src/libutil/map_private.h b/src/libutil/map_private.h
index 379dc8b50b..edd82d8551 100644
--- a/src/libutil/map_private.h
+++ b/src/libutil/map_private.h
@@ -51,6 +51,7 @@ struct rspamd_map_backend {
 	enum fetch_proto protocol;
 	gboolean is_signed;
 	gboolean is_compressed;
+	guint64 id;
 	struct rspamd_cryptobox_pubkey *trusted_pubkey;
 	union {
 		struct file_map_data *fd;