From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 11 Jan 2017 03:15:42 +0000 (+1300)
Subject: replmd: fix variable names in replmd_check_upgrade_links
X-Git-Tag: talloc-2.1.9~248
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9483f7f9f4b7b98418df76ccb5000a132a7003;p=thirdparty%2Fsamba.git

replmd: fix variable names in replmd_check_upgrade_links

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 149681a76a5..c9deb36c66d 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1992,12 +1992,10 @@ static int replmd_update_la_val(TALLOC_CTX *mem_ctx, struct ldb_val *v, struct d
 
 /*
   check if any links need upgrading from w2k format
-
-  The parent_ctx is the ldb_message_element which contains the values array
-  that dns[i].v points at, and which should be used for allocating any new
-  value.
  */
-static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count, struct ldb_message_element *parent_ctx, const struct GUID *invocation_id)
+static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count,
+				      struct ldb_message_element *el,
+				      const struct GUID *invocation_id)
 {
 	uint32_t i;
 	for (i=0; i<count; i++) {
@@ -2025,7 +2023,7 @@ static int replmd_check_upgrade_links(struct parsed_dn *dns, uint32_t count, str
 		}
 
 		/* it's an old one that needs upgrading */
-		ret = replmd_update_la_val(parent_ctx->values, dns[i].v,
+		ret = replmd_update_la_val(el->values, dns[i].v,
 					   dns[i].dsdb_dn, dns[i].dsdb_dn,
 					   invocation_id, 1, 1, 0, 0, false);
 		if (ret != LDB_SUCCESS) {