From: Howard Chu <hyc@openldap.org>
Date: Fri, 4 Nov 2011 18:32:38 +0000 (-0700)
Subject: ITS#7081 fix prev commit
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e438122448bda4168a4d5f84dd251f3590d2b737;p=openldap

ITS#7081 fix prev commit
---

diff --git a/servers/slapd/overlays/pcache.c b/servers/slapd/overlays/pcache.c
index 2af2f06840..8788378a30 100644
--- a/servers/slapd/overlays/pcache.c
+++ b/servers/slapd/overlays/pcache.c
@@ -2448,9 +2448,6 @@ pcache_response(
 		if ( si->slimit > 0 && rs->sr_nentries >= si->slimit ) {
 			si->slimit_exceeded = 1;
 		}
-		if ( si->slimit_exceeded ) {
-			return 0;
-		}
 
 		/* If we haven't exceeded the limit for this query,
 		 * build a chain of answers to store. If we hit the
@@ -2500,6 +2497,9 @@ over:;
 				si->tail = NULL;
 			}
 		}
+		if ( si->slimit_exceeded ) {
+			return 0;
+		}
 	} else if ( rs->sr_type == REP_RESULT ) {
 
 		if ( si->count ) {