fix sizelimit interaction with backglue (ITS#3724)

diff --git a/CHANGES b/CHANGES
index 587f30882160074309b00a33c5c4793a4c590e52..8c4960e1fc7224396d0b93b9ad0fca06229a191c 100644 (file)
--- 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 556f8c8cc08a3794e56cb55667489be46fa3b881..9c7f94b388fd4771a13f8b3a1c713f51d5b7c2d8 100644 (file)
--- 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;