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 1330d61d4133e9c387aff5347848e2123249e5ca..2caff53f5e76b0ef02834223cad76be798a60863 100644 (file)
--- 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;
                }