s4-dsdb: use ldb_msg_canonicalize_ex() in ldbadd-process_file()

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index e057b873a8c34d5f50ba75428b542ea0cd93aabe..3f2f26075571ab96ff2e0dedbfc43368a657cf0a 100644 (file)
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -68,7 +68,16 @@ static int process_file(struct ldb_context *ldb, FILE *f, unsigned int *count)
                        break;
                }
 
-               ldif->msg = ldb_msg_canonicalize(ldb, ldif->msg);
+               ret = ldb_msg_canonicalize_ex(ldb, ldif->msg,
+                                             (TALLOC_CTX*)ldif, &ldif->msg);
+               if (ret != LDB_SUCCESS) {
+                       fprintf(stderr,
+                               "ERR: Message canonicalize failed - %s\n",
+                               ldb_strerror(ret));
+                       failures++;
+                       ldb_ldif_read_free(ldb, ldif);
+                       continue;
+               }
 
                ret = ldb_add_ctrl(ldb, ldif->msg,req_ctrls);
                if (ret != LDB_SUCCESS) {