X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fback-ldbm%2Fmodify.c;h=4754cf3c09d6529c5e96959944fae236f9693775;hb=20965abe9c5bb80d79e5ad791cd2b59ec60259b5;hp=12a1525c24c2299551ee7b8093a0d07b2df7b5bb;hpb=ec8fc19566c6ae517cee9cbe901d524fc617861a;p=openldap
diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 12a1525c24..4754cf3c09 100644
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -1,8 +1,17 @@
/* modify.c - ldbm backend modify routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -17,26 +26,18 @@
#include "back-ldbm.h"
#include "proto-back-ldbm.h"
-static int add_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-static int delete_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-static int replace_values LDAP_P(( Entry *e, Modification *mod, char *dn ));
-
/* We need this function because of LDAP modrdn. If we do not
* add this there would be a bunch of code replication here
* and there and of course the likelihood of bugs increases.
* Juan C. Gomez (gomez@engr.sgi.com) 05/18/99
*/
int ldbm_modify_internal(
- Backend *be,
- Connection *conn,
Operation *op,
- const char *dn,
Modifications *modlist,
Entry *e,
const char **text,
char *textbuf,
- size_t textlen
-)
+ size_t textlen )
{
int rc = LDAP_SUCCESS;
Modification *mod;
@@ -44,15 +45,13 @@ int ldbm_modify_internal(
Attribute *save_attrs;
Attribute *ap;
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_modify_internal: %s\n", dn ));
-#else
- Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal: %s\n", dn, 0, 0);
-#endif
-
+ Debug(LDAP_DEBUG_TRACE,
+ "ldbm_modify_internal: %s\n",
+ e->e_name.bv_val,
+ get_permissiveModify(op) ? " (permissive)" : "",
+ 0 );
- if ( !acl_check_modlist( be, conn, op, e, modlist )) {
+ if ( !acl_check_modlist( op, e, modlist )) {
return LDAP_INSUFFICIENT_ACCESS;
}
@@ -64,131 +63,97 @@ int ldbm_modify_internal(
switch ( mod->sm_op ) {
case LDAP_MOD_ADD:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_modify_internal: add\n" ));
-#else
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
-#endif
-
- rc = add_values( e, mod, op->o_ndn.bv_val );
+ Debug(LDAP_DEBUG_ARGS,
+ "ldbm_modify_internal: add\n", 0, 0, 0);
+ rc = modify_add_values( e, mod, get_permissiveModify( op ),
+ text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: add values failed";
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_modify_internal: failed %d (%s)\n",
- rc, *text ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
-#endif
}
break;
case LDAP_MOD_DELETE:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_modify_internal: delete\n" ));
-#else
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
-#endif
-
- rc = delete_values( e, mod, op->o_ndn.bv_val );
+ Debug(LDAP_DEBUG_ARGS,
+ "ldbm_modify_internal: delete\n", 0, 0, 0);
+
+ rc = modify_delete_values( e, mod, get_permissiveModify( op ),
+ text, textbuf, textlen );
assert( rc != LDAP_TYPE_OR_VALUE_EXISTS );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: delete values failed";
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
-#endif
}
break;
case LDAP_MOD_REPLACE:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_modify_internal: replace\n" ));
-#else
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
-#endif
-
- rc = replace_values( e, mod, op->o_ndn.bv_val );
- assert( rc != LDAP_TYPE_OR_VALUE_EXISTS );
+ Debug(LDAP_DEBUG_ARGS,
+ "ldbm_modify_internal: replace\n", 0, 0, 0);
+
+ rc = modify_replace_values( e, mod, get_permissiveModify( op ),
+ text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- *text = "modify: replace values failed";
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
-#endif
+ }
+ break;
+
+ case LDAP_MOD_INCREMENT:
+ Debug(LDAP_DEBUG_ARGS,
+ "ldbm_modify_internal: increment\n",0,0,0);
+ rc = modify_increment_values( e, mod, get_permissiveModify( op ),
+ text, textbuf, textlen );
+ if( rc != LDAP_SUCCESS ) {
+ Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
+ rc, *text, 0);
}
break;
case SLAP_MOD_SOFTADD:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
- "ldbm_modify_internal: softadd\n" ));
-#else
- Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: softadd\n", 0, 0, 0);
-#endif
+ Debug(LDAP_DEBUG_ARGS,
+ "ldbm_modify_internal: softadd\n", 0, 0, 0);
/* Avoid problems in index_add_mods()
* We need to add index if necessary.
*/
mod->sm_op = LDAP_MOD_ADD;
- rc = add_values( e, mod, op->o_ndn.bv_val );
+ rc = modify_add_values( e, mod, get_permissiveModify( op ),
+ text, textbuf, textlen );
+ mod->sm_op = SLAP_MOD_SOFTADD;
if ( rc == LDAP_TYPE_OR_VALUE_EXISTS ) {
rc = LDAP_SUCCESS;
}
if( rc != LDAP_SUCCESS ) {
- *text = "modify: (soft)add values failed";
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_modify_internal: failed %d (%s)\n", rc, *text ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
-#endif
-
}
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_modify_internal: invalid op %d\n", mod->sm_op ));
-#else
Debug(LDAP_DEBUG_ANY, "ldbm_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
-#endif
rc = LDAP_OTHER;
*text = "Invalid modify operation";
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_modify_internal: %d (%s)\n", rc, *text ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
rc, *text, 0);
-#endif
-
}
if ( rc != LDAP_SUCCESS ) {
goto exit;
}
+ /* If objectClass was modified, reset the flags */
+ if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
+ e->e_ocflags = 0;
+ }
+
/* check if modified attribute was indexed */
- rc = index_is_indexed( be, mod->sm_desc );
+ rc = index_is_indexed( op->o_bd, mod->sm_desc );
if ( rc == LDAP_SUCCESS ) {
ap = attr_find( save_attrs, mod->sm_desc );
if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
@@ -199,25 +164,17 @@ int ldbm_modify_internal(
}
/* check that the entry still obeys the schema */
- rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
+ rc = entry_schema_check( op->o_bd, e, save_attrs, text, textbuf, textlen );
+
if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_modify_internal: entry failed schema check: %s\n",
- *text ));
-#else
Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
*text, 0, 0 );
-#endif
goto exit;
}
/* check for abandon */
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
- rc = op->o_abandon;
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
- if ( rc ) {
+ if ( op->o_abandon ) {
rc = SLAPD_ABANDON;
goto exit;
}
@@ -227,17 +184,13 @@ int ldbm_modify_internal(
/* start with deleting the old index entries */
for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
- rc = index_values( be, ap->a_desc, ap->a_vals, e->e_id,
- SLAP_INDEX_DELETE_OP );
+ rc = index_values( op, ap->a_desc,
+ ap->a_nvals,
+ e->e_id, SLAP_INDEX_DELETE_OP );
if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_modify_internal: Attribute index delete failure\n" ));
-#else
Debug( LDAP_DEBUG_ANY,
- "Attribute index delete failure",
- 0, 0, 0 );
-#endif
+ "ldbm_modify_internal: Attribute index delete failure\n",
+ 0, 0, 0 );
goto exit;
}
ap->a_flags &= ~SLAP_ATTR_IXDEL;
@@ -247,17 +200,13 @@ int ldbm_modify_internal(
/* add the new index entries */
for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
if ( ap->a_flags & SLAP_ATTR_IXADD ) {
- rc = index_values( be, ap->a_desc, ap->a_vals, e->e_id,
- SLAP_INDEX_ADD_OP );
+ rc = index_values( op, ap->a_desc,
+ ap->a_nvals,
+ e->e_id, SLAP_INDEX_ADD_OP );
if ( rc != LDAP_SUCCESS ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_modify_internal: Attribute index add failure\n" ));
-#else
Debug( LDAP_DEBUG_ANY,
- "Attribute index add failure",
- 0, 0, 0 );
-#endif
+ "ldbm_modify_internal: Attribute index add failure\n",
+ 0, 0, 0 );
goto exit;
}
ap->a_flags &= ~SLAP_ATTR_IXADD;
@@ -280,311 +229,114 @@ exit:
int
ldbm_back_modify(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *dn,
- struct berval *ndn,
- Modifications *modlist
-)
+ SlapReply *rs )
{
- int rc;
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
Entry *matched;
Entry *e;
int manageDSAit = get_manageDSAit( op );
- const char *text = NULL;
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_modify: enter\n" ));
-#else
Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
-#endif
+ /* grab giant lock for writing */
+ ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
/* acquire and lock entry */
- if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
- char* matched_dn = NULL;
- BVarray refs;
+ e = dn2entry_w( op->o_bd, &op->o_req_ndn, &matched );
+ /* FIXME: dn2entry() should return non-glue entry */
+ if (( e == NULL ) || ( !manageDSAit && e && is_entry_glue( e ))) {
+ BerVarray deref = NULL;
if ( matched != NULL ) {
- matched_dn = ch_strdup( matched->e_dn );
- refs = is_entry_referral( matched )
- ? get_entry_referrals( be, conn, op, matched )
+ rs->sr_matched = ch_strdup( matched->e_dn );
+ rs->sr_ref = is_entry_referral( matched )
+ ? get_entry_referrals( op, matched )
: NULL;
cache_return_entry_r( &li->li_cache, matched );
} else {
- refs = referral_rewrite( default_referral,
- NULL, dn, LDAP_SCOPE_DEFAULT );
+ if ( !LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo )) {
+ syncinfo_t *si;
+ LDAP_STAILQ_FOREACH( si, &op->o_bd->be_syncinfo, si_next ) {
+ struct berval tmpbv;
+ ber_dupbv( &tmpbv, &si->si_provideruri_bv[0] );
+ ber_bvarray_add( &deref, &tmpbv );
+ }
+ } else {
+ deref = default_referral;
+ }
+ rs->sr_ref = referral_rewrite( deref, NULL, &op->o_req_dn,
+ LDAP_SCOPE_DEFAULT );
}
- send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
- if ( refs ) bvarray_free( refs );
- free( matched_dn );
+ if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+ if ( deref != default_referral ) {
+ ber_bvarray_free( deref );
+ }
+ free( (char *)rs->sr_matched );
- return( -1 );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ return rs->sr_err;
}
- if ( !manageDSAit && is_entry_referral( e ) ) {
+ if ( !manageDSAit && is_entry_referral( e ) )
+ {
/* parent is a referral, don't allow add */
/* parent is an alias, don't allow add */
- BVarray refs = get_entry_referrals( be,
- conn, op, e );
+ rs->sr_ref = get_entry_referrals( op, e );
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_modify: entry (%s) is referral\n", ndn->bv_val ));
-#else
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
-#endif
-
- send_ldap_result( conn, op, LDAP_REFERRAL,
- e->e_dn, NULL, refs, NULL );
-
- if ( refs ) bvarray_free( refs );
+ rs->sr_err = LDAP_REFERRAL;
+ rs->sr_matched = e->e_name.bv_val;
+ send_ldap_result( op, rs );
+ if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
goto error_return;
}
/* Modify the entry */
- rc = ldbm_modify_internal( be, conn, op, ndn->bv_val, modlist, e,
- &text, textbuf, textlen );
+ rs->sr_err = ldbm_modify_internal( op, op->oq_modify.rs_modlist, e,
+ &rs->sr_text, textbuf, textlen );
- if( rc != LDAP_SUCCESS ) {
- if( rc != SLAPD_ABANDON ) {
- send_ldap_result( conn, op, rc,
- NULL, text, NULL, NULL );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ if( rs->sr_err != SLAPD_ABANDON ) {
+ send_ldap_result( op, rs );
}
goto error_return;
}
/* change the entry itself */
- if ( id2entry_add( be, e ) != 0 ) {
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "id2entry failure", NULL, NULL );
+ if ( id2entry_add( op->o_bd, e ) != 0 ) {
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "id2entry failure" );
+ rs->sr_err = LDAP_OTHER;
goto error_return;
}
- send_ldap_result( conn, op, LDAP_SUCCESS,
- NULL, NULL, NULL, NULL );
-
- cache_return_entry_w( &li->li_cache, e );
- return( 0 );
+ rs->sr_text = NULL;
+ send_ldap_error( op, rs, LDAP_SUCCESS,
+ NULL );
-error_return:;
cache_return_entry_w( &li->li_cache, e );
- return( -1 );
-}
-
-static int
-add_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i;
- Attribute *a;
-
- /* char *desc = mod->sm_desc->ad_cname.bv_val; */
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- a = attr_find( e->e_attrs, mod->sm_desc );
-
- /* check if the values we're adding already exist */
- if ( a != NULL ) {
- if( mr == NULL || !mr->smr_match ) {
- /* do not allow add of additional attribute
- if no equality rule exists */
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
- for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
- int rc;
- int j;
- const char *text = NULL;
- struct berval asserted;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- &mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match == 0 ) {
- free( asserted.bv_val );
- return LDAP_TYPE_OR_VALUE_EXISTS;
- }
- }
-
- free( asserted.bv_val );
- }
- }
-
- /* no - add them */
- if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
- /* this should return result return of attr_merge */
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-delete_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i, j, k, found;
- Attribute *a;
- char *desc = mod->sm_desc->ad_cname.bv_val;
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- /* delete the entire attribute */
- if ( mod->sm_bvalues == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "delete_values: removing entire attribute %s\n", desc ));
-#else
- Debug( LDAP_DEBUG_ARGS, "removing entire attribute %s\n",
- desc, 0, 0 );
-#endif
-
- return( attr_delete( &e->e_attrs, mod->sm_desc ) ?
- LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS );
- }
-
- if( mr == NULL || !mr->smr_match ) {
- /* disallow specific attributes from being deleted if
- no equality rule */
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
- /* delete specific values - find the attribute first */
- if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldap_modify_delete: Could not find attribute %s\n", desc ));
-#else
- Debug( LDAP_DEBUG_ARGS, "ldap_modify_delete: "
- "could not find attribute %s\n",
- desc, 0, 0 );
-#endif
-
- return( LDAP_NO_SUCH_ATTRIBUTE );
- }
-
- /* find each value to delete */
- for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
- int rc;
- const char *text = NULL;
-
- struct berval asserted;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- &mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- found = 0;
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match != 0 ) {
- continue;
- }
-
- /* found a matching value */
- found = 1;
-
- /* delete it */
- free( a->a_vals[j].bv_val );
- for ( k = j + 1; a->a_vals[k].bv_val != NULL; k++ ) {
- a->a_vals[k - 1] = a->a_vals[k];
- }
- a->a_vals[k - 1].bv_val = NULL;
-
- break;
- }
-
- free( asserted.bv_val );
-
- /* looked through them all w/o finding it */
- if ( ! found ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ARGS,
- "delete_values: could not find value for attr %s\n", desc ));
-#else
- Debug( LDAP_DEBUG_ARGS,
- "ldbm_modify_delete: could not find value for attr %s\n",
- desc, 0, 0 );
-#endif
-
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
-
- /* if no values remain, delete the entire attribute */
- if ( a->a_vals[0].bv_val == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "delete_values: removing entire attribute %s\n", desc ));
-#else
- Debug( LDAP_DEBUG_ARGS,
- "removing entire attribute %s\n",
- desc, 0, 0 );
-#endif
-
- if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
return LDAP_SUCCESS;
-}
-static int
-replace_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int rc = attr_delete( &e->e_attrs, mod->sm_desc );
-
- if( rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_ATTRIBUTE ) {
- return rc;
- }
-
- if ( mod->sm_bvalues != NULL &&
- attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
- {
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
+error_return:;
+ cache_return_entry_w( &li->li_cache, e );
+ ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock);
+ rs->sr_text = NULL;
+ return rs->sr_err;
}