summaryrefslogtreecommitdiff
path: root/source4/dsdb/schema/schema_init.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-07-31 07:48:16 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-07-31 07:48:16 +1000
commit337752cfd82dc3dbdf918fd45eddd1aa8fb04576 (patch)
tree79aa04fbf294add814fb060f73a1909733b18ec4 /source4/dsdb/schema/schema_init.c
parent2a0677e514b5b9f91d32339077cc7e4187525c3b (diff)
parente45c3e127d389a2cb63879ca12bbbfed048f4eb1 (diff)
downloadsamba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.gz
samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.bz2
samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 15d0951b74b46763024560f9cd012338473c5bc3)
Diffstat (limited to 'source4/dsdb/schema/schema_init.c')
-rw-r--r--source4/dsdb/schema/schema_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index 9b8959466d..85fdbe9e87 100644
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -566,9 +566,10 @@ WERROR dsdb_read_prefixes_from_ldb(TALLOC_CTX *mem_ctx, struct ldb_context *ldb,
return WERR_NOMEM;
}
for (i=0; i < blob->ctr.dsdb.num_mappings; i++) {
+ char *oid;
(*prefixes)[i].id = blob->ctr.dsdb.mappings[i].id_prefix<<16;
- (*prefixes)[i].oid = talloc_strdup(mem_ctx, blob->ctr.dsdb.mappings[i].oid.oid);
- (*prefixes)[i].oid = talloc_asprintf_append((*prefixes)[i].oid, ".");
+ oid = talloc_strdup(mem_ctx, blob->ctr.dsdb.mappings[i].oid.oid);
+ (*prefixes)[i].oid = talloc_asprintf_append(oid, ".");
(*prefixes)[i].oid_len = strlen(blob->ctr.dsdb.mappings[i].oid.oid);
}