From: Howard Chu <hyc@openldap.org>
Date: Tue, 29 Apr 2003 21:51:23 +0000 (+0000)
Subject: Better handling of computed filters
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~208
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c066e87e2cbfd0b2e4846b8e998f606cacd4c1df;p=openldap

Better handling of computed filters
---

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index ebfc607ecc..969329aa7e 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -231,10 +231,12 @@ list_candidates(
 	Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
 #endif
 
-	/* Copy so we can propagate pre-computed IDLs */
-	BDB_IDL_CPY( save, ids );
-
 	for ( f = flist; f != NULL; f = f->f_next ) {
+		/* Ignore undefined filters */
+		if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
+		     f->f_result == SLAPD_COMPARE_UNDEFINED ) {
+		     	continue;
+		}
 		rc = bdb_filter_candidates( op, f, save, tmp,
 			save+BDB_IDL_UM_SIZE );