git.samba.org
/
kamenim
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b5d14fd
)
s4-dsdb: use ldb_msg_normalize() in ldbadd-process_file()
author
Kamen Mazdrashki
<kamenim@samba.org>
Fri, 16 Jul 2010 11:03:53 +0000
(14:03 +0300)
committer
Kamen Mazdrashki
<kamenim@samba.org>
Fri, 16 Jul 2010 11:29:14 +0000
(14:29 +0300)
source4/lib/ldb/tools/ldbadd.c
patch
|
blob
|
history
diff --git
a/source4/lib/ldb/tools/ldbadd.c
b/source4/lib/ldb/tools/ldbadd.c
index e057b873a8c34d5f50ba75428b542ea0cd93aabe..fd05d8fa7f26f9814dad822112d078d57df28049 100644
(file)
--- a/
source4/lib/ldb/tools/ldbadd.c
+++ b/
source4/lib/ldb/tools/ldbadd.c
@@
-68,7
+68,15
@@
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_normalize(ldb, ldif, ldif->msg, &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) {