From: Kamen Mazdrashki <kamenim@samba.org>
Date: Fri, 9 Jul 2010 21:25:37 +0000 (+0300)
Subject: s4-dsdb: use ldb_msg_canonicalize_ex() in source4/dsdb/schema/schema_set.c
X-Git-Url: http://git.samba.org/?p=kamenim%2Fsamba.git;a=commitdiff_plain;h=5fab76861204885029238653c394a7d09ac5cd02

s4-dsdb: use ldb_msg_canonicalize_ex() in source4/dsdb/schema/schema_set.c
---

diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 1330d61d41..2caff53f5e 100644
--- a/source4/dsdb/schema/schema_set.c
+++ b/source4/dsdb/schema/schema_set.c
@@ -660,11 +660,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_canonicalize_ex(ldb, ldif->msg, mem_ctx, &msg);
+	if (ret != LDB_SUCCESS) {
 		goto nomem;
 	}
-	talloc_steal(mem_ctx, msg);
 	talloc_free(ldif);
 
 	prefix_val = ldb_msg_find_ldb_val(msg, "prefixMap");
@@ -692,8 +691,9 @@ 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_canonicalize_ex(ldb, ldif->msg,
+		                              (TALLOC_CTX*)ldif, &msg);
+		if (ret != LDB_SUCCESS) {
 			goto nomem;
 		}