4 files changed, 4 insertions, 126 deletions

diff --git a/source4/lib/ldb/modules/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index 1da1ef661a..246fc5709d 100644
--- a/source4/lib/ldb/modules/ldb_map.c
+++ b/source4/lib/ldb/modules/ldb_map.c
@@ -1233,31 +1233,13 @@ static int map_modify(struct ldb_module *module, const struct ldb_message *msg)
 	return (mp_ret == -1 || fb_ret == -1)?-1:0;
 }
 
-static int map_start_trans(struct ldb_module *module)
-{
-	return ldb_next_start_trans(module);
-}
-
-static int map_end_trans(struct ldb_module *module)
-{
-	return ldb_next_end_trans(module);
-}
-
-static int map_del_trans(struct ldb_module *module)
-{
-	return ldb_next_del_trans(module);
-}
-
 static const struct ldb_module_ops map_ops = {
 	.name              = "map",
 	.search_bytree     = map_search_bytree,
 	.add_record        = map_add,
 	.modify_record     = map_modify,
 	.delete_record     = map_delete,
-	.rename_record     = map_rename,
-	.start_transaction = map_start_trans,
-	.end_transaction   = map_end_trans,
-	.del_transaction   = map_del_trans
+	.rename_record     = map_rename
 };
 
 static char *map_find_url(struct ldb_context *ldb, const char *name)
diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c
index 0275952780..40ff75744e 100644
--- a/source4/lib/ldb/modules/rdn_name.c
+++ b/source4/lib/ldb/modules/rdn_name.c
@@ -194,53 +194,18 @@ static int rdn_name_modify_record(struct ldb_module *module, const struct ldb_me
 	return ret;
 }
 
-static int rdn_name_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_delete_record\n");
-	return ldb_next_delete_record(module, dn);
-}
-
 static int rdn_name_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
 {
 	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_name_rename_record\n");
 	return ldb_next_rename_record(module, olddn, newdn);
 }
 
-static int rdn_start_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_start_trans\n");
-	return ldb_next_start_trans(module);
-}
-
-static int rdn_end_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_end_trans\n");
-	return ldb_next_end_trans(module);
-}
-
-static int rdn_del_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "rdn_del_trans\n");
-	return ldb_next_del_trans(module);
-}
-
-static int rdn_name_destructor(void *module_ctx)
-{
-	/* struct ldb_module *ctx = module_ctx; */
-	/* put your clean-up functions here */
-	return 0;
-}
-
 static const struct ldb_module_ops rdn_name_ops = {
 	.name              = "rdn_name",
 	.search_bytree     = rdn_name_search_bytree,
 	.add_record        = rdn_name_add_record,
 	.modify_record     = rdn_name_modify_record,
-	.delete_record     = rdn_name_delete_record,
-	.rename_record     = rdn_name_rename_record,
-	.start_transaction = rdn_start_trans,
-	.end_transaction   = rdn_end_trans,
-	.del_transaction   = rdn_del_trans
+	.rename_record     = rdn_name_rename_record
 };
 
 
@@ -262,7 +227,5 @@ struct ldb_module *rdn_name_module_init(struct ldb_context *ldb, const char *opt
 	ctx->prev = ctx->next = NULL;
 	ctx->ops = &rdn_name_ops;
 
-	talloc_set_destructor (ctx, rdn_name_destructor);
-
 	return ctx;
 }
diff --git a/source4/lib/ldb/modules/schema.c b/source4/lib/ldb/modules/schema.c
index 7c1753b215..0cae110487 100644
--- a/source4/lib/ldb/modules/schema.c
+++ b/source4/lib/ldb/modules/schema.c
@@ -509,35 +509,13 @@ static int schema_rename_record(struct ldb_module *module, const struct ldb_dn *
 	return ldb_next_rename_record(module, olddn, newdn);
 }
 
-static int schema_start_trans(struct ldb_module *module) {
-	return ldb_next_start_trans(module);
-}
-
-static int schema_end_trans(struct ldb_module *module) {
-	return ldb_next_end_trans(module);
-}
-
-static int schema_del_trans(struct ldb_module *module) {
-	return ldb_next_del_trans(module);
-}
-
-static int schema_destructor(void *module_ctx)
-{
-/* 	struct ldb_module *ctx = module_ctx; */
-	/* put your clean-up functions here */
-	return 0;
-}
-
 static const struct ldb_module_ops schema_ops = {
 	.name              = "schema",
 	.search_bytree     = schema_search_bytree,
 	.add_record        = schema_add_record,
 	.modify_record     = schema_modify_record,
 	.delete_record     = schema_delete_record,
-	.rename_record     = schema_rename_record,
-	.start_transaction = schema_start_trans,
-	.end_transaction   = schema_end_trans,
-	.del_transaction   = schema_del_trans
+	.rename_record     = schema_rename_record
 };
 
 #ifdef HAVE_DLOPEN_DISABLED
@@ -558,7 +536,5 @@ struct ldb_module *schema_module_init(struct ldb_context *ldb, const char *optio
 	ctx->prev = ctx->next = NULL;
 	ctx->ops = &schema_ops;
 
-	talloc_set_destructor (ctx, schema_destructor);
-
 	return ctx;
 }
diff --git a/source4/lib/ldb/modules/timestamps.c b/source4/lib/ldb/modules/timestamps.c
index 5a1e54486a..13e9c2ccc4 100644
--- a/source4/lib/ldb/modules/timestamps.c
+++ b/source4/lib/ldb/modules/timestamps.c
@@ -191,53 +191,12 @@ static int timestamps_modify_record(struct ldb_module *module, const struct ldb_
 	return ret;
 }
 
-static int timestamps_delete_record(struct ldb_module *module, const struct ldb_dn *dn)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_delete_record\n");
-	return ldb_next_delete_record(module, dn);
-}
-
-static int timestamps_rename_record(struct ldb_module *module, const struct ldb_dn *olddn, const struct ldb_dn *newdn)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_rename_record\n");
-	return ldb_next_rename_record(module, olddn, newdn);
-}
-
-static int timestamps_start_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_start_trans\n");
-	return ldb_next_start_trans(module);
-}
-
-static int timestamps_end_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_end_trans\n");
-	return ldb_next_end_trans(module);
-}
-
-static int timestamps_del_trans(struct ldb_module *module)
-{
-	ldb_debug(module->ldb, LDB_DEBUG_TRACE, "timestamps_del_trans\n");
-	return ldb_next_del_trans(module);
-}
-
-static int timestamps_destructor(void *module_ctx)
-{
-	/* struct ldb_module *ctx = module_ctx; */
-	/* put your clean-up functions here */
-	return 0;
-}
 
 static const struct ldb_module_ops timestamps_ops = {
 	.name              = "timestamps",
 	.search_bytree     = timestamps_search_bytree,
 	.add_record        = timestamps_add_record,
-	.modify_record     = timestamps_modify_record,
-	.delete_record     = timestamps_delete_record,
-	.rename_record     = timestamps_rename_record,
-	.start_transaction = timestamps_start_trans,
-	.end_transaction   = timestamps_end_trans,
-	.del_transaction   = timestamps_del_trans
+	.modify_record     = timestamps_modify_record
 };
 
 
@@ -259,7 +218,5 @@ struct ldb_module *timestamps_module_init(struct ldb_context *ldb, const char *o
 	ctx->prev = ctx->next = NULL;
 	ctx->ops = &timestamps_ops;
 
-	talloc_set_destructor (ctx, timestamps_destructor);
-
 	return ctx;
 }