From: Howard Chu <hyc@openldap.org>
Date: Wed, 14 May 2003 22:04:55 +0000 (+0000)
Subject: Import ITS#2506 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_20~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75fd7e1688bb37b56e08a3c2dee5488ce09b8cfd;p=thirdparty%2Fopenldap.git

Import ITS#2506 fix from HEAD
---

diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index c7e6792552..0b8ea28278 100644
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -51,8 +51,7 @@ filter_candidates(
 		switch( f->f_result ) {
 		case SLAPD_COMPARE_UNDEFINED:
 		/* This technically is not the same as FALSE, but it
-		 * certainly will produce no matches. list_candidates
-		 * will take care of ignoring this filter.
+		 * certainly will produce no matches.
 		 */
 		/* FALLTHRU */
 		case LDAP_COMPARE_FALSE:
@@ -709,10 +708,6 @@ list_candidates(
 
 	idl = NULL;
 	for ( f = flist; f != NULL; f = f->f_next ) {
-		if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
-		     f->f_result == SLAPD_COMPARE_UNDEFINED ) {
-			continue;
-		}
 		if ( (tmp = filter_candidates( be, f )) == NULL &&
 		    ftype == LDAP_FILTER_AND ) {
 #ifdef NEW_LOGGING