From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 16 Nov 2012 17:52:45 +0000 (+0100)
Subject: Revert "bla"
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=6add96593e5b6e075d16dd3cdbffa4feaffba5e0

Revert "bla"

This reverts commit d5ab1bd1dc6b7b6c23291605fba59627b7a1a10d.
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 0a5dc6738c4f..1f3a8d84574a 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -68,11 +68,8 @@ struct replmd_private {
 		uint64_t mod_usn_urgent;
 	} *ncs;
 
-	TALLOC_CTX *sd_updates_mem_ctx;
-	struct sd_update {
-		struct sd_update *prev, *next;
-		struct ldb_dn *dn;
-	} *sd_updates;
+	uint32_t num_sd_updates;
+	struct ldb_dn *sd_updates;
 };
 
 struct la_entry {
@@ -193,9 +190,9 @@ static void replmd_txn_cleanup(struct replmd_private *replmd_private)
 	replmd_private->la_backlinks = NULL;
 	replmd_private->bl_ctx = NULL;
 
-	talloc_free(replmd_private->sd_updates_mem_ctx);
-	replmd_private->sd_updates_mem_ctx = NULL;
+	talloc_free(replmd_private->sd_updates);
 	replmd_private->sd_updates = NULL;
+	replmd_private->num_sd_updates = 0;
 }
 
 
@@ -3992,10 +3989,7 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar,
 
 static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 {
-	struct replmd_private *replmd_private =
-		talloc_get_type_abort(ldb_module_get_private(ar->module),
-		struct replmd_private);
-	struct ldb_context *ldb = ldb_module_get_ctx(ar->module);
+	struct ldb_context *ldb;
 	struct ldb_request *change_req;
 	enum ndr_err_code ndr_err;
 	struct ldb_message *msg;
@@ -4009,8 +4003,11 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 	unsigned int removed_attrs = 0;
 	int ret;
 	int (*callback)(struct ldb_request *req, struct ldb_reply *ares) = replmd_op_callback;
+	struct replmd_private *replmd_private = talloc_get_type(ldb_module_get_private(module),
+								struct replmd_private);
 	bool sd_updated = false;
 
+	ldb = ldb_module_get_ctx(ar->module);
 	msg = ar->objs->objects[ar->index_current].msg;
 
 	rmd = ar->objs->objects[ar->index_current].meta_data;
@@ -4199,15 +4196,6 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
 		  ar->index_current, msg->num_elements);
 
 	if (sd_updated) {
-		struct sd_update *up;
-
-		up = talloc_zero(replmd_private->sd_updates_mem_ctx,
-				 struct sd_update);
-		if (up == NULL) {
-
-		}
-		up->dn = msg->dn;
-		DLIST_ADD_END(eplmd_private->sd_updates, up);
 		//ret = replmd_add_
 		//replmd_private;
 		//BINARY_ARRAY_SEARCH
@@ -5225,7 +5213,6 @@ static int replmd_prepare_commit(struct ldb_module *module)
 		talloc_get_type(ldb_module_get_private(module), struct replmd_private);
 	struct la_entry *la, *prev;
 	struct la_backlink *bl;
-	struct sd_update *up;
 	int ret;
 
 	/* walk the list backwards, to do the first entry first, as we
@@ -5251,10 +5238,6 @@ static int replmd_prepare_commit(struct ldb_module *module)
 		}
 	}
 
-	for (up=replmd_private->sd_updates; up; up = up->next) {
-
-	}
-
 	replmd_txn_cleanup(replmd_private);
 
 	/* possibly change @REPLCHANGED */