Print error strings when transactions fail in ldb tools

[kai/samba.git] / source4 / lib / ldb / tools / ldbmodify.c

diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 5fabba57b7f6200b843887875b87458a2e9f5e8c..0288e4e6885bb197155d37bbbbc32bef16df4f10 100644 (file)
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.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,9 +31,8 @@
  *  Author: Andrew Tridgell
  */
 
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
+#include "ldb_includes.h"
+#include "tools/cmdline.h"
 
 static int failures;
 
@@ -53,112 +51,76 @@ static void usage(void)
 /*
   process modifies for one file
 */
-static int process_file(struct ldb_context *ldb, FILE *f)
+static int process_file(struct ldb_context *ldb, FILE *f, int *count)
 {
        struct ldb_ldif *ldif;
-       int ret = -1, count = 0;
+       int ret = LDB_SUCCESS;
        
        while ((ldif = ldb_ldif_read_file(ldb, f))) {
                switch (ldif->changetype) {
                case LDB_CHANGETYPE_NONE:
                case LDB_CHANGETYPE_ADD:
-                       ret = ldb_add(ldb, &ldif->msg);
+                       ret = ldb_add(ldb, ldif->msg);
                        break;
                case LDB_CHANGETYPE_DELETE:
-                       ret = ldb_delete(ldb, ldif->msg.dn);
+                       ret = ldb_delete(ldb, ldif->msg->dn);
                        break;
                case LDB_CHANGETYPE_MODIFY:
-                       ret = ldb_modify(ldb, &ldif->msg);
+                       ret = ldb_modify(ldb, ldif->msg);
                        break;
                }
-               if (ret != 0) {
+               if (ret != LDB_SUCCESS) {
                        fprintf(stderr, "ERR: \"%s\" on DN %s\n", 
-                               ldb_errstring(ldb), ldif->msg.dn);
+                               ldb_errstring(ldb), ldb_dn_get_linearized(ldif->msg->dn));
                        failures++;
                } else {
-                       count++;
+                       (*count)++;
                }
                ldb_ldif_read_free(ldb, ldif);
        }
 
-       return count;
+       return ret;
 }
 
- int main(int argc, char * const argv[])
+int main(int argc, const char **argv)
 {
        struct ldb_context *ldb;
        int count=0;
-       const char *ldb_url;
-       const char **options = NULL;
-       int ldbopts;
-       int opt, i;
-
-       ldb_url = getenv("LDB_URL");
-
-       ldbopts = 0;
-       while ((opt = getopt(argc, argv, "hH:o:")) != EOF) {
-               switch (opt) {
-               case 'H':
-                       ldb_url = optarg;
-                       break;
-
-               case 'o':
-                       options = ldb_options_parse(options, &ldbopts, optarg);
-                       break;
-
-               case 'h':
-               default:
-                       usage();
-                       break;
-               }
-       }
-
-       if (!ldb_url) {
-               fprintf(stderr, "You must specify a ldb URL\n\n");
-               usage();
-       }
-
-       argc -= optind;
-       argv += optind;
+       int i, ret=LDB_SUCCESS;
+       struct ldb_cmdline *options;
 
-       ldb = ldb_connect(ldb_url, 0, options);
+       ldb = ldb_init(NULL, NULL);
 
-       if (!ldb) {
-               perror("ldb_connect");
+       if (ldb_transaction_start(ldb) != 0) {
+               printf("Failed to start transaction: %s\n", ldb_errstring(ldb));
                exit(1);
        }
 
-       ldb_set_debug_stderr(ldb);
-
-       if (argc == 0) {
-               usage();
-               exit(1);
+       options = ldb_cmdline_process(ldb, argc, argv, usage);
+
+       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);
+               }
        }
 
-       for (i=0;i<argc;i++) {
-               FILE *f;
-               if (strcmp(argv[i],"-") == 0) {
-                       f = stdin;
-               } else {
-                       f = fopen(argv[i], "r");
-               }
-               if (!f) {
-                       perror(argv[i]);
-                       exit(1);
-               }
-               count += process_file(ldb, f);
-               if (f != stdin) {
-                       fclose(f);
-               }
+       if (count != 0 && ldb_transaction_commit(ldb) != 0) {
+               printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
+               exit(1);
        }
 
-       ldb_close(ldb);
+       talloc_free(ldb);
 
        printf("Modified %d records with %d failures\n", count, failures);
 
-       if (failures != 0) {
-               return -1;
-       }
-       
-       return 0;
+       return ret;
 }