From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 13 Nov 2001 20:31:00 +0000 (+0000)
Subject: Remove slap_get_time optimization.
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~869
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=90a60edef9d0a459f2d3587c65338476d19b2972;p=openldap

Remove slap_get_time optimization.
timelimit must be checked on first entry.
---

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 3f8d76a2ad..1b95248dd6 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -299,7 +299,7 @@ searchit:
 		ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
 
 		/* check time limit */
-		if ( tlimit != -1 && (ID_BLOCK_NIDS(candidates) > 2) && slap_get_time() > stoptime ) {
+		if ( tlimit != -1 && slap_get_time() > stoptime ) {
 			send_search_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
 				NULL, NULL, v2refs, NULL, nentries );
 			rc = 0;