mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better processing of extensible filters. Needs testing, but the prior

Browse Source 
version was not encoding properly the filter.
This commit is contained in:
Julio Sánchez Fernández 2000-10-15 19:17:06 +00:00
parent 336f054d05
commit 5d899f0c00
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
libraries/libldap/search.c
View File

@ -753,38 +753,39 @@ put_simple_filter(
if( dn == NULL ) {
if(! ldap_is_attr_desc( str ) ) goto done;
break;
}
} else {
*dn++ = '\0';
rule = strchr( dn, ':' );
*dn++ = '\0';
rule = strchr( dn, ':' );
if( rule == NULL ) {
/* one colon */
if ( strcmp(dn, "dn") == 0 ) {
/* must have attribute */
if( !ldap_is_attr_desc( str ) ) {
if( rule == NULL ) {
/* one colon */
if ( strcmp(dn, "dn") == 0 ) {
/* must have attribute */
if( !ldap_is_attr_desc( str ) ) {
goto done;
}
rule = "";
} else {
rule = dn;
dn = NULL;
}
} else {
/* two colons */
*rule++ = '\0';
if ( strcmp(dn, "dn") != 0 ) {
/* must have "dn" */
goto done;
}
rule = "";
} else {
rule = dn;
dn = NULL;
}
} else {
/* two colons */
*rule++ = '\0';
if ( strcmp(dn, "dn") != 0 ) {
/* must have "dn" */
goto done;
}
}
if ( *str == '\0' && *rule == '\0' ) {
if ( *str == '\0' && ( !rule || *rule == '\0' ) ) {
/* must have either type or rule */
goto done;
}
@ -793,13 +794,13 @@ put_simple_filter(
goto done;
}
if ( *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
if ( rule && *rule != '\0' && !ldap_is_attr_oid( rule ) ) {
goto done;
}
rc = ber_printf( ber, "t{" /*}*/, ftype );
if( rc != -1 && *rule != '\0' ) {
if( rc != -1 && rule && *rule != '\0' ) {
rc = ber_printf( ber, "ts", LDAP_FILTER_EXT_OID, rule );
}
if( rc != -1 && *str != '\0' ) {
@ -818,7 +819,7 @@ put_simple_filter(
}
}
}
break;
goto done;
default:
if ( ldap_pvt_find_wildcard( value ) == NULL ) {