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 92ed29e6b89a9ede146591850a851c21ea1049a7..3f2f26075571ab96ff2e0dedbfc43368a657cf0a 100644 (file)
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -10,7 +10,7 @@
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
+   version 3 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +18,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
 /*
@@ -32,50 +31,118 @@
  *  Author: Andrew Tridgell
  */
 
-#include "includes.h"
+#include "ldb.h"
+#include "tools/cmdline.h"
+#include "ldbutil.h"
 
- int main(void)
-{
-       static struct ldb_context *ldb;
-       struct ldb_ldif *ldif;
-       int ret;
-       int count=0, failures=0;
-       const char *ldb_url;
+static unsigned int failures;
+static struct ldb_cmdline *options;
 
-       ldb_url = getenv("LDB_URL");
-       if (!ldb_url) {
-               ldb_url = "tdb://test.ldb";
-       }
+static void usage(void)
+{
+       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);
+}
 
-       ldb = ldb_connect(ldb_url, 0, NULL);
 
-       if (!ldb) {
-               perror("ldb_connect");
-               exit(1);
+/*
+  add records from an opened file
+*/
+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 = ldif_read_file(stdin))) {
 
+       while ((ldif = ldb_ldif_read_file(ldb, f))) {
                if (ldif->changetype != LDB_CHANGETYPE_ADD &&
                    ldif->changetype != LDB_CHANGETYPE_NONE) {
                        fprintf(stderr, "Only CHANGETYPE_ADD records allowed\n");
                        break;
                }
 
-               ret = ldb_add(ldb, &ldif->msg);
-               if (ret != 0) {
-                       fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-                               ldb_errstring(ldb), ldif->msg.dn);
+               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) {
+                       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++;
+                       (*count)++;
+                       if (options->verbose) {
+                               printf("Added %s\n", ldb_dn_get_linearized(ldif->msg->dn));
+                       }
+               }
+               ldb_ldif_read_free(ldb, ldif);
+       }
+
+       return ret;
+}
+
+
+
+int main(int argc, const char **argv)
+{
+       struct ldb_context *ldb;
+       unsigned int i, count = 0;
+       int ret=0;
+       TALLOC_CTX *mem_ctx = talloc_new(NULL);
+
+       ldb = ldb_init(mem_ctx, NULL);
+
+       options = ldb_cmdline_process(ldb, argc, argv, usage);
+
+       if (ldb_transaction_start(ldb) != 0) {
+               printf("Failed to start transaction: %s\n", ldb_errstring(ldb));
+               exit(1);
+       }
+
+       if (options->argc == 0) {
+               ret = process_file(ldb, stdin, &count);
+       } else {
+               for (i=0;i<options->argc;i++) {
+                       const char *fname = options->argv[i];
+                       FILE *f;
+                       f = fopen(fname, "r");
+                       if (!f) {
+                               perror(fname);
+                               exit(1);
+                       }
+                       ret = process_file(ldb, f, &count);
+                       fclose(f);
+               }
+       }
+
+       if (count != 0) {
+               if (ldb_transaction_commit(ldb) != 0) {
+                       printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
+                       exit(1);
                }
-               ldif_read_free(ldif);
+       } else {
+               ldb_transaction_cancel(ldb);
        }
 
-       ldb_close(ldb);
+       talloc_free(mem_ctx);
 
        printf("Added %d records with %d failures\n", count, failures);
        
-       return 0;
+       return ret;
 }