Fix prev commit, broke extended filters

[openldap] / servers / slapd / back-bdb / filterindex.c

diff --git a/servers/slapd/back-bdb/filterindex.c b/servers/slapd/back-bdb/filterindex.c
index 93db2904ad291f0a42eeac2af2d7672447e4d93b..ae75380ab99df26caf3563bec9131c43a7aedd69 100644 (file)
--- 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