summaryrefslogtreecommitdiff
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-11-15 15:33:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:28:13 -0500
commita39db6303060466ab82366ac9395a6b5a9ca4627 (patch)
treedd0cb413c7af55ad7876e098c75749063e5be4d1 /source4/lib/ldb
parent38272577f1648182dc5c9ddf1b011aa03b292d28 (diff)
downloadsamba-a39db6303060466ab82366ac9395a6b5a9ca4627.tar.gz
samba-a39db6303060466ab82366ac9395a6b5a9ca4627.tar.bz2
samba-a39db6303060466ab82366ac9395a6b5a9ca4627.zip
r19719: don't use 'new' as var name samba3 doesn't like it...
metze (This used to be commit 7a4f46c1c9ec8119db46ffc57d77fcf13ca0c5a8)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/common/ldb_dn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/common/ldb_dn.c b/source4/lib/ldb/common/ldb_dn.c
index 550b80c26a..48f471bf6f 100644
--- a/source4/lib/ldb/common/ldb_dn.c
+++ b/source4/lib/ldb/common/ldb_dn.c
@@ -704,7 +704,7 @@ static struct ldb_dn_component ldb_dn_copy_component(void *mem_ctx, struct ldb_d
/* 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 @@ struct ldb_dn *ldb_dn_copy_rebase(void *mem_ctx, const struct ldb_dn *old, const
}
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