From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Wed, 28 Mar 2018 18:55:15 +0000 (+0100)
Subject: More conversions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbb18c971d0341a822419091d0d8ea343604ecc0;p=thirdparty%2Ffreeradius-server.git

More conversions
---

diff --git a/src/main/radclient.c b/src/main/radclient.c
index 47aaf66dadf..d35792ac4a2 100644
--- a/src/main/radclient.c
+++ b/src/main/radclient.c
@@ -1173,7 +1173,7 @@ int main(int argc, char **argv)
 
 	talloc_set_log_stderr();
 
-	filename_tree = rbtree_create(NULL, filename_cmp, NULL, 0);
+	filename_tree = rbtree_talloc_create(NULL, filename_cmp, rc_file_pair_t, NULL, 0);
 	if (!filename_tree) {
 	oom:
 		ERROR("Out of memory");
diff --git a/src/main/radsniff.c b/src/main/radsniff.c
index ac3203fdae2..457a9a0ffbe 100644
--- a/src/main/radsniff.c
+++ b/src/main/radsniff.c
@@ -2556,7 +2556,7 @@ int main(int argc, char *argv[])
 			usage(64);
 		}
 
-		link_tree = rbtree_create(conf, (rbcmp) rs_rtx_cmp, _unmark_link, 0);
+		link_tree = rbtree_talloc_create(conf, (rbcmp) rs_rtx_cmp, rs_request_t, _unmark_link, 0);
 		if (!link_tree) {
 			ERROR("Failed creating RTX tree");
 			goto finish;
@@ -2620,7 +2620,7 @@ int main(int argc, char *argv[])
 	/*
 	 *	Setup the request tree
 	 */
-	request_tree = rbtree_create(conf, (rbcmp) rs_packet_cmp, _unmark_request, 0);
+	request_tree = rbtree_talloc_create(conf, (rbcmp) rs_packet_cmp, rs_request_t, _unmark_request, 0);
 	if (!request_tree) {
 		ERROR("Failed creating request tree");
 		goto finish;
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
index 0838719f084..e4ca05ba5d1 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
@@ -108,7 +108,7 @@ static int mod_instantiate(UNUSED rlm_cache_config_t const *config, void *instan
 	/*
 	 *	The cache.
 	 */
-	driver->cache = rbtree_talloc_create(NULL, cache_entry_cmp, rlm_cache_entry_t, NULL, 0);
+	driver->cache = rbtree_talloc_create(NULL, cache_entry_cmp, rlm_cache_rbtree_entry_t, NULL, 0);
 	if (!driver->cache) {
 		ERROR("Failed to create cache");
 		return -1;
diff --git a/src/modules/rlm_csv/rlm_csv.c b/src/modules/rlm_csv/rlm_csv.c
index 4d234aaafc8..e098a112f35 100644
--- a/src/modules/rlm_csv/rlm_csv.c
+++ b/src/modules/rlm_csv/rlm_csv.c
@@ -163,6 +163,7 @@ static rlm_csv_entry_t *file2csv(CONF_SECTION *conf, rlm_csv_t *inst, int lineno
 
 	MEM(e = (rlm_csv_entry_t *)talloc_zero_array(inst->tree, uint8_t,
 						     sizeof(*e) + inst->used_fields + sizeof(e->data[0])));
+	talloc_set_type(e, rlm_csv_entry_t);
 
 	for (p = buffer, i = 0; p != NULL; p = q, i++) {
 		if (!buf2entry(inst, p, &q)) {
diff --git a/src/modules/rlm_securid/rlm_securid.c b/src/modules/rlm_securid/rlm_securid.c
index fc71eabaaa0..04628c99397 100644
--- a/src/modules/rlm_securid/rlm_securid.c
+++ b/src/modules/rlm_securid/rlm_securid.c
@@ -428,7 +428,7 @@ static int mod_instantiate(void *instance, UNUSED CONF_SECTION *conf)
 	 *	Lookup sessions in the tree.  We don't free them in
 	 *	the tree, as that's taken care of elsewhere...
 	 */
-	inst->session_tree = rbtree_create(NULL, securid_session_cmp, NULL, 0);
+	inst->session_tree = rbtree_talloc_create(NULL, securid_session_cmp, SECURID_SESSION NULL, 0);
 	if (!inst->session_tree) {
 		ERROR("Cannot initialize session tree");
 		return -1;