summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorKamen Mazdrashki <kamenim@samba.org>2010-07-16 13:59:40 +0300
committerAndrew Bartlett <abartlet@samba.org>2010-07-19 17:33:34 +1000
commit86cc914717a915808479126a14baa915450b24f6 (patch)
tree5dbe74f5da254c528731edb875aee7a4ad2935e7 /source4/dsdb
parente5a9469a88e039b558e13273ae637f874bbb42b3 (diff)
downloadsamba-86cc914717a915808479126a14baa915450b24f6.tar.gz
samba-86cc914717a915808479126a14baa915450b24f6.tar.bz2
samba-86cc914717a915808479126a14baa915450b24f6.zip
s4-dsdb: use ldb_msg_normalize() in source4/dsdb/schema/schema_set.c
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/schema/schema_set.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 4752737b59..b8ed7ca3e1 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -667,11 +667,10 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const
}
talloc_steal(mem_ctx, ldif);
- msg = ldb_msg_canonicalize(ldb, ldif->msg);
- if (!msg) {
+ ret = ldb_msg_normalize(ldb, mem_ctx, ldif->msg, &msg);
+ if (ret != LDB_SUCCESS) {
goto nomem;
}
- talloc_steal(mem_ctx, msg);
talloc_free(ldif);
prefix_val = ldb_msg_find_ldb_val(msg, "prefixMap");
@@ -697,8 +696,8 @@ WERROR dsdb_set_schema_from_ldif(struct ldb_context *ldb, const char *pf, const
while ((ldif = ldb_ldif_read_string(ldb, &df))) {
talloc_steal(mem_ctx, ldif);
- msg = ldb_msg_canonicalize(ldb, ldif->msg);
- if (!msg) {
+ ret = ldb_msg_normalize(ldb, ldif, ldif->msg, &msg);
+ if (ret != LDB_SUCCESS) {
goto nomem;
}