diff options
| author | Jeremy Allison <jra@samba.org> | 2009-01-02 11:39:04 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-01-02 11:39:04 -0800 |
| commit | 11576353f645d7d7f44a74d27545b946c6175658 (patch) | |
| tree | a756a430d3fea82ac8a24144613d5d7e04d163f1 /source3/lib/ldb/tools/ldbadd.c | |
| parent | 2234173220c51c2e37818149ddf41421672904c0 (diff) | |
| parent | 268f3e93a4dd66ce43dc53278eff01f801ba5083 (diff) | |
| download | samba-11576353f645d7d7f44a74d27545b946c6175658.tar.gz samba-11576353f645d7d7f44a74d27545b946c6175658.tar.bz2 samba-11576353f645d7d7f44a74d27545b946c6175658.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/ldb/tools/ldbadd.c')
| -rw-r--r-- | source3/lib/ldb/tools/ldbadd.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source3/lib/ldb/tools/ldbadd.c b/source3/lib/ldb/tools/ldbadd.c index 4dde2a1ef5..155395e065 100644 --- a/source3/lib/ldb/tools/ldbadd.c +++ b/source3/lib/ldb/tools/ldbadd.c @@ -35,8 +35,6 @@ #include "ldb/include/includes.h" #include "ldb/tools/cmdline.h" -static int failures; - static void usage(void) { printf("Usage: ldbadd <options> <ldif...>\n"); @@ -53,7 +51,8 @@ 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, int *count, + int *failures) { struct ldb_ldif *ldif; int ret = LDB_SUCCESS; @@ -71,7 +70,7 @@ static int process_file(struct ldb_context *ldb, FILE *f, int *count) if (ret != LDB_SUCCESS) { fprintf(stderr, "ERR: \"%s\" on DN %s\n", ldb_errstring(ldb), ldb_dn_linearize(ldb, ldif->msg->dn)); - failures++; + (*failures)++; } else { (*count)++; } @@ -86,7 +85,7 @@ 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; + int i, ret=0, count=0, failures=0; struct ldb_cmdline *options; ldb_global_init(); @@ -96,7 +95,7 @@ int main(int argc, const char **argv) options = ldb_cmdline_process(ldb, argc, argv, usage); if (options->argc == 0) { - ret = process_file(ldb, stdin, &count); + ret = process_file(ldb, stdin, &count, &failures); } else { for (i=0;i<options->argc;i++) { const char *fname = options->argv[i]; @@ -106,7 +105,7 @@ int main(int argc, const char **argv) perror(fname); exit(1); } - ret = process_file(ldb, f, &count); + ret = process_file(ldb, f, &count, &failures); fclose(f); } } |