Commit 75fd7e16 authored by Howard Chu's avatar Howard Chu
Browse files

Import ITS#2506 fix from HEAD

parent 19cb5e52
...@@ -51,8 +51,7 @@ filter_candidates( ...@@ -51,8 +51,7 @@ filter_candidates(
switch( f->f_result ) { switch( f->f_result ) {
case SLAPD_COMPARE_UNDEFINED: case SLAPD_COMPARE_UNDEFINED:
/* This technically is not the same as FALSE, but it /* This technically is not the same as FALSE, but it
* certainly will produce no matches. list_candidates * certainly will produce no matches.
* will take care of ignoring this filter.
*/ */
/* FALLTHRU */ /* FALLTHRU */
case LDAP_COMPARE_FALSE: case LDAP_COMPARE_FALSE:
...@@ -709,10 +708,6 @@ list_candidates( ...@@ -709,10 +708,6 @@ list_candidates(
idl = NULL; idl = NULL;
for ( f = flist; f != NULL; f = f->f_next ) { 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 && if ( (tmp = filter_candidates( be, f )) == NULL &&
ftype == LDAP_FILTER_AND ) { ftype == LDAP_FILTER_AND ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment