From: Howard Chu <hyc@openldap.org>
Date: Fri, 18 Apr 2003 05:56:12 +0000 (+0000)
Subject: Fix prev commit, broke extended filters
X-Git-Tag: OPENLDAP_REL_ENG_2_1_18~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab75cb6e0466434e8fef708b44d308e6c3386e5d;p=thirdparty%2Fopenldap.git

Fix prev commit, broke extended filters
---

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 93db2904ad..ae75380ab9 100644
--- a/servers/slapd/back-bdb/filterindex.c
+++ b/servers/slapd/back-bdb/filterindex.c
@@ -146,7 +146,6 @@ bdb_filter_candidates(
                 { struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 		BDB_IDL_ALL( bdb, ids );
 		}
-
 		break;
 
 	case LDAP_FILTER_AND:
@@ -176,6 +175,10 @@ bdb_filter_candidates(
 		Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
 			(unsigned long) f->f_choice, 0, 0 );
 #endif
+		/* Must not return NULL, otherwise extended filters break */
+                { struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+		BDB_IDL_ALL( bdb, ids );
+		}
 	}
 
 #ifdef NEW_LOGGING