Print error strings when transactions fail in ldb tools

[kai/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 5be3b7fc759e9394e83fdab70729ea9800a95e21..f32a4fa9bc2e3cad6ba31ddd894eeb16a697fd23 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,14 +31,8 @@
  *  Author: Andrew Tridgell
  */
 
-#include "includes.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
-#include "ldb/tools/cmdline.h"
-
-#ifdef _SAMBA_BUILD_
-#include "system/filesys.h"
-#endif
+#include "ldb_includes.h"
+#include "tools/cmdline.h"
 
 static int failures;
 
@@ -59,10 +52,10 @@ static void usage(void)
 /*
   add records from an opened 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, count=0;
+       int ret = LDB_SUCCESS;
 
        while ((ldif = ldb_ldif_read_file(ldb, f))) {
                if (ldif->changetype != LDB_CHANGETYPE_ADD &&
@@ -74,33 +67,38 @@ static int process_file(struct ldb_context *ldb, FILE *f)
                ldif->msg = ldb_msg_canonicalize(ldb, ldif->msg);
 
                ret = ldb_add(ldb, ldif->msg);
-               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, const char **argv)
+int main(int argc, const char **argv)
 {
        struct ldb_context *ldb;
-       int i, count=0;
+       int i, ret=0, count=0;
        struct ldb_cmdline *options;
 
-       ldb = ldb_init(NULL);
+       ldb = ldb_init(NULL, 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) {
-               count += process_file(ldb, stdin);
+               ret = process_file(ldb, stdin, &count);
        } else {
                for (i=0;i<options->argc;i++) {
                        const char *fname = options->argv[i];
@@ -110,14 +108,19 @@ static int process_file(struct ldb_context *ldb, FILE *f)
                                perror(fname);
                                exit(1);
                        }
-                       count += process_file(ldb, f);
+                       ret = process_file(ldb, f, &count);
                        fclose(f);
                }
        }
 
+       if (count != 0 && ldb_transaction_commit(ldb) != 0) {
+               printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
+               exit(1);
+       }
+
        talloc_free(ldb);
 
        printf("Added %d records with %d failures\n", count, failures);
        
-       return 0;
+       return ret;
 }