r2051: switched the samdb over to using the new destructor and reference

count features of talloc, instead of re-implementing both those
features inside of samdb (which is what we did before).

This makes samdb considerably simpler, and also fixes some bugs, as I
found some error paths that didn't call samdb_close(). Those are now
handled by the fact that a talloc_free() will auto-close and destroy
the samdb context, using a destructor.
(This used to be commit da60987a92266734c33b81ee217081abdc4330f3)

1 files changed, 12 insertions, 11 deletions

diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c
index c02692703c..7be75258af 100644
--- a/source4/rpc_server/samr/samdb.c
+++ b/source4/rpc_server/samr/samdb.c
@@ -42,11 +42,20 @@ void samdb_debug(void *context, enum ldb_debug_level level, const char *fmt, va_
 	free(s);
 }
 
+/* close a connection to the sam */
+int samdb_destructor(void *ctx)
+{
+	struct samdb_context *sam_ctx = ctx;
+	/* we don't actually close due to broken posix locking semantics */
+	sam_ctx->ldb = NULL;
+	return 0;
+}				 
+
 /*
   connect to the SAM database
   return an opaque context pointer on success, or NULL on failure
  */
-void *samdb_connect(void)
+void *samdb_connect(TALLOC_CTX *mem_ctx)
 {
 	struct samdb_context *ctx;
 	/*
@@ -68,26 +77,18 @@ void *samdb_connect(void)
 
 	ldb_set_debug(static_sam_db, samdb_debug, NULL);
 
-	ctx = malloc_p(struct samdb_context);
+	ctx = talloc_p(NULL, struct samdb_context);
 	if (!ctx) {
 		errno = ENOMEM;
 		return NULL;
 	}
 
 	ctx->ldb = static_sam_db;
+	talloc_set_destructor(ctx, samdb_destructor);
 
 	return ctx;
 }
 
-/* close a connection to the sam */
-void samdb_close(void *ctx)
-{
-	struct samdb_context *sam_ctx = ctx;
-	/* we don't actually close due to broken posix locking semantics */
-	sam_ctx->ldb = NULL;
-	free(sam_ctx);
-}				 
-
 /*
   search the sam for the specified attributes - varargs variant
 */