mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
More for #6561 - delete returns NO_SUCH_ATTRIBUTE, not TYPE_OR_VALUE_EXISTS
This commit is contained in:
parent
07147abadc
commit
bfa05a5e32
@ -153,7 +153,6 @@ int bdb_modify_internal(
|
|||||||
mod->sm_desc->ad_cname.bv_val, 0, 0);
|
mod->sm_desc->ad_cname.bv_val, 0, 0);
|
||||||
err = modify_delete_values( e, mod, get_permissiveModify(op),
|
err = modify_delete_values( e, mod, get_permissiveModify(op),
|
||||||
text, textbuf, textlen );
|
text, textbuf, textlen );
|
||||||
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
|
|
||||||
if( err != LDAP_SUCCESS ) {
|
if( err != LDAP_SUCCESS ) {
|
||||||
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
|
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
|
||||||
err, *text, 0);
|
err, *text, 0);
|
||||||
@ -229,7 +228,7 @@ int bdb_modify_internal(
|
|||||||
|
|
||||||
mod->sm_op = SLAP_MOD_SOFTDEL;
|
mod->sm_op = SLAP_MOD_SOFTDEL;
|
||||||
|
|
||||||
if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
|
if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
|
||||||
err = LDAP_SUCCESS;
|
err = LDAP_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user