mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-01-24 13:24:56 +08:00
Extend checks to substrings rules. Need to kludge around
LDAP's kludged builtin substrings rules.
This commit is contained in:
parent
8a5b200c44
commit
69ba1a21bc
@ -526,15 +526,23 @@ at_add(
|
||||
return SLAP_SCHERR_ATTR_BAD_MR;
|
||||
}
|
||||
|
||||
#if 0
|
||||
if( sat->sat_syntax != mr->smr_syntax ) {
|
||||
if( mr->smr_compat_syntaxes == NULL ) {
|
||||
/* due to funky LDAP builtin substring rules, we
|
||||
* we check against the equality rule assertion
|
||||
* syntax and compat syntaxes instead of those
|
||||
* associated with the substrings rule.
|
||||
*/
|
||||
if( sat->sat_equality &&
|
||||
sat->sat_syntax != sat->sat_equality->smr_syntax )
|
||||
{
|
||||
if( sat->sat_equality->smr_compat_syntaxes == NULL ) {
|
||||
*err = sat->sat_substr_oid;
|
||||
return SLAP_SCHERR_ATTR_BAD_MR;
|
||||
}
|
||||
|
||||
for(i=0; mr->smr_compat_syntaxes[i]; i++) {
|
||||
if( sat->sat_syntax == mr->smr_compat_syntaxes[i] ) {
|
||||
for(i=0; sat->sat_equality->smr_compat_syntaxes[i]; i++) {
|
||||
if( sat->sat_syntax ==
|
||||
sat->sat_equality->smr_compat_syntaxes[i] )
|
||||
{
|
||||
i = -1;
|
||||
break;
|
||||
}
|
||||
@ -545,7 +553,6 @@ at_add(
|
||||
return SLAP_SCHERR_ATTR_BAD_MR;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
sat->sat_substr = mr;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user