From 475ea1ca595b3f6ea5fd6476c28f21995d781529 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sat, 5 Feb 2011 13:19:56 +0100 Subject: ldb:ldbedit tool - don't forget about the "do_edit" result code Use it for computing the program exit code. The "result" has not to be free'd explicitly since it's a child by "ldb" which itself is child by "mem_ctx". --- source4/lib/ldb/tools/ldbedit.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index ecdb4d7f62..09c59cf6cd 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -343,20 +343,13 @@ int main(int argc, const char **argv) if (result->count == 0) { printf("no matching records - cannot edit\n"); - return 0; + talloc_free(mem_ctx); + return LDB_SUCCESS; } - do_edit(ldb, result->msgs, result->count, options->editor); - - if (result) { - ret = talloc_free(result); - if (ret == -1) { - fprintf(stderr, "talloc_free failed\n"); - exit(1); - } - } + ret = do_edit(ldb, result->msgs, result->count, options->editor); talloc_free(mem_ctx); - return 0; + return ret == 0 ? LDB_SUCCESS : LDB_ERR_OPERATIONS_ERROR; } -- cgit