From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Sat, 5 Feb 2011 12:19:56 +0000 (+0100)
Subject: ldb:ldbedit tool - don't forget about the "do_edit" result code
X-Git-Tag: tevent-0.9.11~821
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=475ea1ca595b3f6ea5fd6476c28f21995d781529;p=thirdparty%2Fsamba.git

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".
---

diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index ecdb4d7f621..09c59cf6cda 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;
 }