svn commit: samba r19719 - in branches/SAMBA_4_0/source/lib/ldb/common: .

[metze at samba.org]

Author: metze
Date: 2006-11-15 15:33:38 +0000 (Wed, 15 Nov 2006)
New Revision: 19719

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19719

Log:
don't use 'new' as var name samba3 doesn't like it...

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-15 15:31:11 UTC (rev 19718)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_dn.c	2006-11-15 15:33:38 UTC (rev 19719)
@@ -704,7 +704,7 @@
 /* Copy a DN but replace the old with the new base DN. */
 struct ldb_dn *ldb_dn_copy_rebase(void *mem_ctx, const struct ldb_dn *old, const struct ldb_dn *old_base, const struct ldb_dn *new_base)
 {
-	struct ldb_dn *new;
+	struct ldb_dn *new_dn;
 	int i, offset;
 
 	/* Perhaps we don't need to rebase at all? */
@@ -713,12 +713,12 @@
 	}
 
 	offset = old->comp_num - old_base->comp_num;
-	new = ldb_dn_copy_partial(mem_ctx, new_base, offset + new_base->comp_num);
+	new_dn = ldb_dn_copy_partial(mem_ctx, new_base, offset + new_base->comp_num);
 	for (i = 0; i < offset; i++) {
-		new->components[i] = ldb_dn_copy_component(new->components, &(old->components[i]));
+		new_dn->components[i] = ldb_dn_copy_component(new_dn->components, &(old->components[i]));
 	}
 
-	return new;
+	return new_dn;
 }
 
 /* copy specified number of elements of a dn into a new one