From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 13 May 2005 13:01:42 +0000 (+0000)
Subject: fix sizelimit interaction with backglue (ITS#3724)
X-Git-Tag: OPENLDAP_REL_ENG_2_2_27~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=333b5a46f83cbe1d7150193c6e6c7ffce88f5446;p=thirdparty%2Fopenldap.git

fix sizelimit interaction with backglue (ITS#3724)
---

diff --git a/CHANGES b/CHANGES
index 587f308821..8c4960e1fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.2.27 Engineering
 	Fixed back-bdb/hdb slapcat checkpoint on close (ITS#3703)
 	Fixed back-ldap/back-meta debug output of NULL strings (ITS#3698)
 	Fixed back-meta sizelimit bug (ITS#3720)
+	Fixed back-meta/backglue sizelimit interaction (ITS#3724)
 	Fixed syncrepl runqueue (ITS#3542)
 	Fixed ACL val default style parsing crasher (ITS#3700)
 	Build Environment
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 556f8c8cc0..9c7f94b388 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -349,8 +349,7 @@ new_candidate:;
 				goto finish;
 
 			} else if ( rc == LDAP_RES_SEARCH_ENTRY ) {
-				if ( op->ors_slimit > 0 && rs->sr_nentries == op->ors_slimit )
-				{
+				if ( --op->ors_slimit == -1 ) {
 					ldap_msgfree( res );
 					res = NULL;
 
@@ -374,7 +373,8 @@ new_candidate:;
 				 * entry that has the base DN
 				 */
 				if ( op->ors_scope == LDAP_SCOPE_BASE
-						&& rs->sr_nentries > 0 ) {
+						&& rs->sr_nentries > 0 )
+				{
 					candidates = 0;
 					sres = LDAP_SUCCESS;
 					break;