upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-03 20:40:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9772 Allow objectClass edits that don't actually change them

Browse source
This commit is contained in:
Ondřej Kuzník 2022-01-13 11:03:47 +00:00 committed by Quanah Gibson-Mount
parent 4b18c2be00
commit 2443e986d1
1 changed files with 43 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
servers/slapd/bconfig.c
View file

@ -5895,8 +5895,49 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
if ( !oc_at ) return LDAP_OBJECT_CLASS_VIOLATION;
for (ml = op->orm_modlist; ml; ml=ml->sml_next) {
if (ml->sml_desc == slap_schema.si_ad_objectClass)
return rc;
if (ml->sml_desc == slap_schema.si_ad_objectClass) {
/* We'd be fine comparing the structural objectclass before and
* after, but AUXILIARY ocs exist so we have to check them all */
unsigned int i, j;
if ( ml->sml_numvals != oc_at->a_numvals ) {
snprintf( ca->cr_msg, sizeof(ca->cr_msg),
"objectclass modification disallowed" );
return LDAP_UNWILLING_TO_PERFORM;
}
for ( i = 0; i < oc_at->a_numvals; i++ ) {
ObjectClass *new_oc, *old_oc = oc_bvfind( &oc_at->a_vals[i] );
int found = 0;
if ( old_oc == NULL ) {
snprintf( ca->cr_msg, sizeof(ca->cr_msg),
"no objectClass named %s",
oc_at->a_vals[i].bv_val );
return LDAP_OBJECT_CLASS_VIOLATION;
}
for ( j = 0; j < ml->sml_numvals; j++ ) {
new_oc = oc_bvfind( &ml->sml_values[j] );
if ( new_oc == NULL ) {
snprintf( ca->cr_msg, sizeof(ca->cr_msg),
"no objectClass named %s",
ml->sml_values[j].bv_val );
return LDAP_OBJECT_CLASS_VIOLATION;
}
if ( old_oc == new_oc ) {
found = 1;
break;
}
}
if ( !found ) {
snprintf( ca->cr_msg, sizeof(ca->cr_msg),
"objectclass modification disallowed" );
return LDAP_UNWILLING_TO_PERFORM;
}
}
}
}
colst = count_ocs( oc_at, &nocs );