r11567: Ldb API change patch.

This patch changes the way lsb_search is called and the meaning of the returned integer.
The last argument of ldb_search is changed from struct ldb_message to struct ldb_result
which contains a pointer to a struct ldb_message list and a count of the number of messages.
The return is not the count of messages anymore but instead it is an ldb error value.

I tryed to keep the patch as tiny as possible bu as you can guess I had to change a good
amount of places. I also tried to double check all my changes being sure that the calling
functions would still behave as before. But this patch is big enough that I fear some bug
may have been introduced anyway even if it passes the test suite. So if you are currently
working on any file being touched please give it a deep look and blame me for any error.

Simo.
(This used to be commit 22c8c97e6fb466b41859e090e959d7f1134be780)

1 files changed, 9 insertions, 8 deletions

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 4abc7269d5..f8c06f0fa4 100644
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -34,6 +34,7 @@
 
 #include "includes.h"
 #include "ldb/include/ldb.h"
+#include "ldb/include/ldb_errors.h"
 #include "ldb/include/ldb_private.h"
 #include "ldb/tools/cmdline.h"
 
@@ -71,10 +72,10 @@ static int do_search(struct ldb_context *ldb,
 		     const char * const *attrs)
 {
 	int ret, i;
-	struct ldb_message **msgs;
+	struct ldb_result *result = NULL;
 
-	ret = ldb_search(ldb, basedn, scope, expression, attrs, &msgs);
-	if (ret == -1) {
+	ret = ldb_search(ldb, basedn, scope, expression, attrs, &result);
+	if (ret != LDB_SUCCESS) {
 		printf("search failed - %s\n", ldb_errstring(ldb));
 		return -1;
 	}
@@ -83,16 +84,16 @@ static int do_search(struct ldb_context *ldb,
 
 	ldbsearch_ldb = ldb;
 	if (sort_attribs) {
-		qsort(msgs, ret, sizeof(struct ldb_message *),
+		qsort(result->msgs, ret, sizeof(struct ldb_message *),
 				(comparison_fn_t)do_compare_msg);
 	}
 
-	for (i=0;i<ret;i++) {
+	for (i = 0; i < result->count; i++) {
 		struct ldb_ldif ldif;
 		printf("# record %d\n", i+1);
 
 		ldif.changetype = LDB_CHANGETYPE_NONE;
-		ldif.msg = msgs[i];
+		ldif.msg = result->msgs[i];
 
                 if (sort_attribs) {
                         /*
@@ -106,8 +107,8 @@ static int do_search(struct ldb_context *ldb,
 		ldb_ldif_write_file(ldb, stdout, &ldif);
 	}
 
-	if (ret > 0) {
-		ret = talloc_free(msgs);
+	if (result) {
+		ret = talloc_free(result);
 		if (ret == -1) {
 			fprintf(stderr, "talloc_free failed\n");
 			exit(1);