More for #6561 - delete returns NO_SUCH_ATTRIBUTE, not TYPE_OR_VALUE_EXISTS

diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index 896c06fb390f765b4e6c7bb96b53d90a543e551e..bbf19f3c6a837de4111bcdd06c7233c58adcecc3 100644 (file)
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -153,7 +153,6 @@ int bdb_modify_internal(
                                mod->sm_desc->ad_cname.bv_val, 0, 0);
                        err = modify_delete_values( e, mod, get_permissiveModify(op),
                                text, textbuf, textlen );
-                       assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
                                Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -229,7 +228,7 @@ int bdb_modify_internal(
 
                        mod->sm_op = SLAP_MOD_SOFTDEL;
 
-                       if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
+                       if ( err == LDAP_NO_SUCH_ATTRIBUTE ) {
                                err = LDAP_SUCCESS;
                        }