More conversions

diff --git a/src/main/radclient.c b/src/main/radclient.c
index 47aaf66dadf1ff690d52582dd162c076c19c8670..d35792ac4a29b5836167f35a535eb1aa94b784d6 100644 (file)
--- 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 ac3203fdae2c22e2ff7af5e4ab14201b00cc3d72..457a9a0ffbe43594b588fc7e748afd8d50f52eda 100644 (file)
--- 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 0838719f08441582db5702babc8fb47c144cac88..e4ca05ba5d1f074a6f5294f69c7cee183a3bd487 100644 (file)
--- 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 4d234aaafc811392d9e90a70e8db5ffe6691cef4..e098a112f35d66f407ed5588ff8c301122f139cd 100644 (file)
--- 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 fc71eabaaa0fa76e9bc613f0c51118b5904b644d..04628c99397049bef2581882cb444b46e4673a04 100644 (file)
--- 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;