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, 19 insertions, 19 deletions

diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 81a9626f14..d4e6003e5f 100644
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/ldap_server/ldap_rootdse.c
@@ -22,6 +22,7 @@
 #include "ldap_server/ldap_server.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
+#include "lib/ldb/include/ldb_errors.h"
 
 #define ATTR_BLOB_CONST(val) data_blob_talloc(mem_ctx, val, sizeof(val)-1)
 
@@ -267,12 +268,12 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps
 	void *local_ctx;
 	struct ldap_SearchResEntry *ent;
 	struct ldap_Result *done;
-	struct ldb_message **res = NULL;
+	struct ldb_result *res = NULL;
 	int result = LDAP_SUCCESS;
 	struct ldapsrv_reply *ent_r, *done_r;
 	struct ldb_context *ldb;
 	const char *errstr = NULL;
-	int count, j;
+	int ret, j;
 	const char **attrs = NULL;
 
 	if (r->scope != LDAP_SEARCH_SCOPE_BASE) {
@@ -295,11 +296,10 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps
 		attrs[j] = NULL;
 	}
 
-	count = ldb_search(ldb, ldb_dn_explode(local_ctx, "cn=rootDSE"), 0, 
-			   NULL, attrs, &res);
+	ret = ldb_search(ldb, ldb_dn_explode(local_ctx, "cn=rootDSE"), 0, NULL, attrs, &res);
 	talloc_steal(local_ctx, res);
 
-	if (count == 1) {
+	if (ret == LDB_SUCCESS && res->count == 1) {
 		ent_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultEntry);
 		NT_STATUS_HAVE_NO_MEMORY(ent_r);
 
@@ -307,11 +307,11 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps
 		ent->dn = "";
 		ent->num_attributes = 0;
 		ent->attributes = NULL;
-		if (res[0]->num_elements == 0) {
+		if (res->msgs[0]->num_elements == 0) {
 			goto queue_reply;
 		}
-		ent->num_attributes = res[0]->num_elements;
-		ent->attributes = talloc_steal(ent_r, res[0]->elements);
+		ent->num_attributes = res->msgs[0]->num_elements;
+		ent->attributes = talloc_steal(ent_r, res->msgs[0]->elements);
 
 		for (j=0; j < ent->num_attributes; j++) {
 			if (ent->attributes[j].num_values == 1 &&
@@ -330,22 +330,22 @@ queue_reply:
 	done_r = ldapsrv_init_reply(call, LDAP_TAG_SearchResultDone);
 	NT_STATUS_HAVE_NO_MEMORY(done_r);
 
-	if (count == 1) {
-		DEBUG(10,("rootdse_Search: results: [%d]\n",count));
-		result = LDAP_SUCCESS;
-		errstr = NULL;
-	} else if (count == 0) {
+	if (ret != LDB_SUCCESS) {
+		DEBUG(10,("rootdse_Search: error\n"));
+		result = LDAP_OTHER;
+		errstr = ldb_errstring(ldb);
+	} else if (res->count == 0) {
 		DEBUG(10,("rootdse_Search: no results\n"));
 		result = LDAP_NO_SUCH_OBJECT;
 		errstr = ldb_errstring(ldb);
-	} else if (count > 1) {
-		DEBUG(10,("rootdse_Search: too many results[%d]\n", count));
+	} else if (res->count == 1) {
+		DEBUG(10,("rootdse_Search: results: [%d]\n", res->count));
+		result = LDAP_SUCCESS;
+		errstr = NULL;
+	} else if (res->count > 1) {
+		DEBUG(10,("rootdse_Search: too many results[%d]\n", res->count));
 		result = LDAP_OTHER; 
 		errstr = "internal error";	
-	} else if (count == -1) {
-		DEBUG(10,("rootdse_Search: error\n"));
-		result = LDAP_OTHER;
-		errstr = ldb_errstring(ldb);
 	}
 
 	done = &done_r->msg->r.SearchResultDone;