Pass a threadsafe ctx into fr_connection_pool create callback

[freeradius.git] / src / modules / rlm_couchbase / mod.c

diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index a7a163c..5f9d606 100644 (file)
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -34,8 +34,20 @@ RCSID("$Id$");
 #include "couchbase.h"
 #include "jsonc_missing.h"
 
+/* free couchbase instance handle and any additional context memory */
+static int _mod_conn_free(rlm_couchbase_handle_t *chandle)
+{
+       lcb_t cb_inst = chandle->handle;                /* couchbase instance */
+
+       /* destroy/free couchbase instance */
+       lcb_destroy(cb_inst);
+
+       /* return */
+       return 0;
+}
+
 /* create new connection pool handle */
-void *mod_conn_create(void *instance)
+void *mod_conn_create(TALLOC_CTX *ctx, void *instance)
 {
        rlm_couchbase_t *inst = instance;           /* module instance pointer */
        rlm_couchbase_handle_t *chandle = NULL;     /* connection handle pointer */
@@ -56,7 +68,9 @@ void *mod_conn_create(void *instance)
        }
 
        /* allocate memory for couchbase connection instance abstraction */
-       chandle = talloc_zero(inst, rlm_couchbase_handle_t);
+       chandle = talloc_zero(ctx, rlm_couchbase_handle_t);
+       talloc_set_destructor(chandle, _mod_conn_free);
+
        cookie = talloc_zero(chandle, cookie_t);
 
        /* initialize cookie error holder */
@@ -90,22 +104,6 @@ int mod_conn_alive(UNUSED void *instance, void *handle)
        return true;
 }
 
-/* free couchbase instance handle and any additional context memory */
-int mod_conn_delete(UNUSED void *instance, void *handle)
-{
-       rlm_couchbase_handle_t *chandle = handle;       /* connection instance handle */
-       lcb_t cb_inst = chandle->handle;                /* couchbase instance */
-
-       /* destroy/free couchbase instance */
-       lcb_destroy(cb_inst);
-
-       /* free handle */
-       talloc_free(chandle);
-
-       /* return */
-       return true;
-}
-
 /* build json object for mapping radius attributes to json elements */
 int mod_build_attribute_element_map(CONF_SECTION *conf, void *instance)
 {