From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 29 Nov 2005 18:43:30 +0000 (+0000)
Subject: From HEAD:
X-Git-Tag: OPENLDAP_REL_ENG_2_3_13~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fa3000169cb774c52cb70a2b639bec736a76011d;p=openldap

From HEAD:
ITS#4226 must close cursor when limiting candidate check
ITS#4227 delta-sync should use subtree search
---

diff --git a/CHANGES b/CHANGES
index 2fc5cc9292..3d457c3928 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,13 @@ OpenLDAP 2.3.13 Engineering
 	Fixed slapd sizelimit disclose issue (ITS#4213)
 	Fixed slapd gentlehup write restrict issue (ITS#3717)
 	Fixed slapd gentlehup abnormal issue (ITS#4217)
+	Fixed slapd delta-sync subtree scope issue (ITS#4227)
 	Fixed slapd cn=config OID/name pollution issue (ITS#4185)
 	Fixed slapd cn=config rootdn issue (ITS#4192)
 	Fixed slapd cn=config slaptest -F without -f issue (ITS#4194)
 	Fixed slapd cn=config ACL issue (ITS#4218)
 	Fixed slapd-bdb negative results IDL cache issue (ITS#4223)
+	Fixed slapd-bdb cursor close issue (ITS#4226)
 	Fixed slapd-hdb slapadd -q issue (ITS#4210)
 	Fixed slapd-hdb missing results issue (ITS#4186)
 	Fixed slapd-ldap potential double free issue (ITS#4189)
diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index a1e124d614..d12b4f6548 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -1066,8 +1066,10 @@ inequality_candidates(
 		bdb_idl_union( ids, tmp );
 
 		if( op->ors_limit && op->ors_limit->lms_s_unchecked != -1 &&
-			BDB_IDL_N( ids ) >= (unsigned) op->ors_limit->lms_s_unchecked )
+			BDB_IDL_N( ids ) >= (unsigned) op->ors_limit->lms_s_unchecked ) {
+			cursor->c_close( cursor );
 			break;
+		}
 	}
 	ber_bvarray_free_x( keys, op->o_tmpmemctx );
 
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index abce34456c..2fd3d59f59 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -349,7 +349,7 @@ ldap_sync_search(
 		filter = si->si_logfilterstr.bv_val;
 		attrs = lattrs;
 		attrsonly = 0;
-		scope = LDAP_SCOPE_ONELEVEL;
+		scope = LDAP_SCOPE_SUBTREE;
 	} else {
 		rhint = 1;
 		base = si->si_base.bv_val;