From: Howard Chu <hyc@openldap.org>
Date: Tue, 21 Jun 2011 09:40:38 +0000 (-0700)
Subject: ITS#6973 need limits_check if overlay is global
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~1324
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae24a1a6ac91f5313de91618abe03683798035fe;p=thirdparty%2Fopenldap.git

ITS#6973 need limits_check if overlay is global
---

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 160ba485bf..69b202bb42 100644
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -873,6 +873,9 @@ static int sssvlv_op_search(
 	}
 	ldap_pvt_thread_mutex_unlock( &sort_conns_mutex );
 	if ( ok ) {
+		/* If we're a global overlay, this check got bypassed */
+		if ( !op->ors_limit && limits_check( op, rs ))
+			return rs->sr_err;
 		/* are we continuing a VLV search? */
 		if ( so && vc && vc->vc_context ) {
 			so->so_ctrl = sc;