mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix computed TRUE/FALSE filters

Browse Source
This commit is contained in:
Howard Chu 2003-04-29 05:58:28 +00:00
parent 169c7afcdf
commit 2931966ea5
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
servers/slapd/filter.c
View File

@ -212,6 +212,10 @@ get_filter(
if ( err != LDAP_SUCCESS ) {
break;
}
if ( f.f_and == NULL ) {
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_TRUE;
}
/* no assert - list could be empty */
break;
@ -226,6 +230,10 @@ get_filter(
if ( err != LDAP_SUCCESS ) {
break;
}
if ( f.f_or == NULL ) {
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_FALSE;
}
/* no assert - list could be empty */
break;
@ -243,6 +251,21 @@ get_filter(
}
assert( f.f_not != NULL );
if ( f.f_not->f_choice == SLAPD_FILTER_COMPUTED ) {
if ( f.f_not->f_result == LDAP_COMPARE_TRUE ) {
op->o_tmpfree( f.f_not, op->o_tmpmemctx );
f.f_not = NULL;
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_FALSE;
} else if ( f.f_not->f_result == LDAP_COMPARE_FALSE ) {
op->o_tmpfree( f.f_not, op->o_tmpmemctx );
f.f_not = NULL;
f.f_choice = SLAPD_FILTER_COMPUTED;
f.f_result = LDAP_COMPARE_TRUE;
}
/* Leave UNDEFINED alone */
}
break;
case LDAP_FILTER_EXT: