ldb:ldbadd/modify tool - return error code when at least one operation has failed

[mat/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 1374765f57540f5cfd8abbc12af75e01266fa9c3..1e7aa80d835e59a00ca0c5d2d143963c9b571894 100644 (file)
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -52,7 +52,7 @@ static void usage(struct ldb_context *ldb)
 static int process_file(struct ldb_context *ldb, FILE *f, unsigned int *count)
 {
        struct ldb_ldif *ldif;
-       int ret = LDB_SUCCESS;
+       int fun_ret = LDB_SUCCESS, ret;
        struct ldb_control **req_ctrls = ldb_parse_control_strings(ldb, ldb, (const char **)options->controls);
 
        if (options->controls != NULL &&  req_ctrls== NULL) {
@@ -78,6 +78,7 @@ static int process_file(struct ldb_context *ldb, FILE *f, unsigned int *count)
                                ldb_strerror(ret),
                                ldb_errstring(ldb), ldb_dn_get_linearized(ldif->msg->dn));
                        failures++;
+                       fun_ret = ret;
                } else {
                        (*count)++;
                        if (options->verbose) {
@@ -89,10 +90,10 @@ static int process_file(struct ldb_context *ldb, FILE *f, unsigned int *count)
 
        if (!feof(f)) {
                fprintf(stderr, "Failed to parse ldif\n");
-               return -1;
+               fun_ret = LDB_ERR_OPERATIONS_ERROR;
        }
 
-       return ret;
+       return fun_ret;
 }
 
 int main(int argc, const char **argv)