From bfa05a5e3299cf4cb2ca3cb4a39268f5a9961604 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 4 Mar 2011 07:54:06 +0000 Subject: [PATCH] More for #6561 - delete returns NO_SUCH_ATTRIBUTE, not TYPE_OR_VALUE_EXISTS --- servers/slapd/back-bdb/modify.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 896c06fb39..bbf19f3c6a 100644 --- 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; } -- 2.39.5