ITS#6821 make sure objectclass is processed before other mods

This commit is contained in:
Howard Chu 2011-02-03 00:15:09 +00:00
parent 4225acc07a
commit 14b7b19c0d

View File

@ -377,6 +377,14 @@ int ndb_modify_internal(
return rc;
}
if ( got_oc ) {
rc = ndb_entry_put_info( op->o_bd, NA, 1 );
if ( rc ) {
attrs_free( old );
return rc;
}
}
/* apply modifications to DB */
modai = (NdbAttrInfo **)op->o_tmpalloc( nmods * sizeof(NdbAttrInfo*), op->o_tmpmemctx );
@ -400,7 +408,8 @@ int ndb_modify_internal(
}
ldap_pvt_thread_rdwr_runlock( &ni->ni_ai_rwlock );
if ( got_oc || indexed ) {
/* If got_oc, this was already done above */
if ( indexed && !got_oc) {
rc = ndb_entry_put_info( op->o_bd, NA, 1 );
if ( rc ) {
attrs_free( old );