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

[kamenim/samba.git] / source4 / lib / ldb / tools / ldbadd.c

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index be02334797fa4e4f21f47901f0343d23fc274e21..3f2f26075571ab96ff2e0dedbfc43368a657cf0a 100644 (file)
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -33,18 +33,16 @@
 
 #include "ldb.h"
 #include "tools/cmdline.h"
+#include "ldbutil.h"
 
-static int failures;
+static unsigned int failures;
+static struct ldb_cmdline *options;
 
 static void usage(void)
 {
-       printf("Usage: ldbadd <options> <ldif...>\n");
-       printf("Options:\n");
-       printf("  -H ldb_url       choose the database (or $LDB_URL)\n");
-       printf("  -o options       pass options like modules to activate\n");
-       printf("              e.g: -o modules:timestamps\n");
-       printf("\n");
+       printf("Usage: ldbadd <options> <ldif...>\n");  
        printf("Adds records to a ldb, reading ldif the specified list of files\n\n");
+       ldb_cmdline_help("ldbadd", stdout);
        exit(1);
 }
 
@@ -52,10 +50,16 @@ static void usage(void)
 /*
   add records from an opened file
 */
-static int process_file(struct ldb_context *ldb, FILE *f, int *count)
+static int process_file(struct ldb_context *ldb, FILE *f, unsigned int *count)
 {
        struct ldb_ldif *ldif;
        int ret = LDB_SUCCESS;
+        struct ldb_control **req_ctrls = ldb_parse_control_strings(ldb, ldb, (const char **)options->controls);
+       if (options->controls != NULL &&  req_ctrls== NULL) {
+               printf("parsing controls failed: %s\n", ldb_errstring(ldb));
+               return -1;
+       }
+
 
        while ((ldif = ldb_ldif_read_file(ldb, f))) {
                if (ldif->changetype != LDB_CHANGETYPE_ADD &&
@@ -64,15 +68,28 @@ static int process_file(struct ldb_context *ldb, FILE *f, 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(ldb, ldif->msg);
+               ret = ldb_add_ctrl(ldb, ldif->msg,req_ctrls);
                if (ret != LDB_SUCCESS) {
-                       fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-                               ldb_errstring(ldb), ldb_dn_get_linearized(ldif->msg->dn));
+                       fprintf(stderr, "ERR: %s : \"%s\" on DN %s\n",
+                               ldb_strerror(ret), ldb_errstring(ldb),
+                               ldb_dn_get_linearized(ldif->msg->dn));
                        failures++;
                } else {
                        (*count)++;
+                       if (options->verbose) {
+                               printf("Added %s\n", ldb_dn_get_linearized(ldif->msg->dn));
+                       }
                }
                ldb_ldif_read_free(ldb, ldif);
        }
@@ -85,10 +102,11 @@ static int process_file(struct ldb_context *ldb, FILE *f, int *count)
 int main(int argc, const char **argv)
 {
        struct ldb_context *ldb;
-       int i, ret=0, count=0;
-       struct ldb_cmdline *options;
+       unsigned int i, count = 0;
+       int ret=0;
+       TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
-       ldb = ldb_init(NULL, NULL);
+       ldb = ldb_init(mem_ctx, NULL);
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 
@@ -113,12 +131,16 @@ int main(int argc, const char **argv)
                }
        }
 
-       if (count != 0 && ldb_transaction_commit(ldb) != 0) {
-               printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
-               exit(1);
+       if (count != 0) {
+               if (ldb_transaction_commit(ldb) != 0) {
+                       printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
+                       exit(1);
+               }
+       } else {
+               ldb_transaction_cancel(ldb);
        }
 
-       talloc_free(ldb);
+       talloc_free(mem_ctx);
 
        printf("Added %d records with %d failures\n", count, failures);