svn commit: samba r8222 - in branches/SAMBA_4_0/source/ldap_server: .

[metze at samba.org]

Author: metze
Date: 2005-07-08 05:04:57 +0000 (Fri, 08 Jul 2005)
New Revision: 8222

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8222

Log:
0 entries are no error, unless it's a base search

metze
Modified:
   branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c
===================================================================
--- branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c	2005-07-08 04:55:22 UTC (rev 8221)
+++ branches/SAMBA_4_0/source/ldap_server/ldap_simple_ldb.c	2005-07-08 05:04:57 UTC (rev 8222)
@@ -47,6 +47,7 @@
 	struct ldb_context *samdb;
 	struct ldb_message **res = NULL;
 	int i, j, y, count = 0;
+	int success_limit = 1;
 	enum ldb_scope scope = LDB_SCOPE_DEFAULT;
 	const char **attrs = NULL;
 	const char *errstr = NULL;
@@ -67,14 +68,17 @@
 		case LDAP_SEARCH_SCOPE_BASE:
 			DEBUG(10,("sldb_Search: scope: [BASE]\n"));
 			scope = LDB_SCOPE_BASE;
+			success_limit = 1;
 			break;
 		case LDAP_SEARCH_SCOPE_SINGLE:
 			DEBUG(10,("sldb_Search: scope: [ONE]\n"));
 			scope = LDB_SCOPE_ONELEVEL;
+			success_limit = 0;
 			break;
 		case LDAP_SEARCH_SCOPE_SUB:
 			DEBUG(10,("sldb_Search: scope: [SUB]\n"));
 			scope = LDB_SCOPE_SUBTREE;
+			success_limit = 0;
 			break;
 	}
 
@@ -135,7 +139,7 @@
 	NT_STATUS_HAVE_NO_MEMORY(done_r);
 
 	if (result == LDAP_SUCCESS) {
-		if (count > 0) {
+		if (count >= success_limit) {
 			DEBUG(10,("sldb_Search: results: [%d]\n",count));
 			result = LDAP_SUCCESS;
 			errstr = NULL;