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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/schema/schema_set.c b/source4/dsdb/schema/schema_set.c
index 4752737b59e0abd0f8362c8393baef19955a5d27..b8ed7ca3e13443ecbb8c806edaaa161e18458080 100644 (file)
--- 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;
                }