X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdelete.c;h=d33e957f678f6dd3d1457399c586200fe8060e6a;hb=9fc4a749dcecda7176cea4859fa8f51bbc91feff;hp=c1d619841de67e7f99048d47f133e39f8b9915c9;hpb=24a4d888dc5d31a9a52f10d05cd68e969c5cf1b6;p=openldap diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c index c1d619841d..d33e957f67 100644 --- a/servers/slapd/back-ldbm/delete.c +++ b/servers/slapd/back-ldbm/delete.c @@ -1,7 +1,7 @@ /* delete.c - ldbm backend delete routine */ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -27,28 +27,29 @@ ldbm_back_delete( { struct ldbminfo *li = (struct ldbminfo *) be->be_private; Entry *matched; - char *pdn = NULL; + struct berval pdn; Entry *e, *p = NULL; - int rootlock = 0; int rc = -1; int manageDSAit = get_manageDSAit( op ); AttributeDescription *children = slap_schema.si_ad_children; #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, - "ldbm_back_delete: %s\n", dn->bv_val )); + LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_delete: %s\n", dn->bv_val, 0, 0 ); #else Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn->bv_val, 0, 0); #endif + /* grab giant lock for writing */ + ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock); + /* get entry with writer lock */ - if ( (e = dn2entry_w( be, ndn->bv_val, &matched )) == NULL ) { + if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) { char *matched_dn = NULL; - struct berval **refs; + BerVarray refs; #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "ldbm_back_delete: no such object %s\n", dn->bv_val )); + LDAP_LOG( BACK_LDBM, INFO, + "ldbm_back_delete: no such object %s\n", dn->bv_val, 0, 0 ); #else Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n", dn->bv_val, 0, 0); @@ -57,20 +58,21 @@ ldbm_back_delete( if ( matched != NULL ) { matched_dn = ch_strdup( matched->e_dn ); refs = is_entry_referral( matched ) - ? get_entry_referrals( be, conn, op, matched, - dn->bv_val, LDAP_SCOPE_DEFAULT ) + ? get_entry_referrals( be, conn, op, matched ) : NULL; cache_return_entry_r( &li->li_cache, matched ); } else { refs = referral_rewrite( default_referral, - NULL, dn->bv_val, LDAP_SCOPE_DEFAULT ); + NULL, dn, LDAP_SCOPE_DEFAULT ); } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn, NULL, refs, NULL ); - ber_bvecfree( refs ); + if ( refs ) ber_bvarray_free( refs ); free( matched_dn ); return( -1 ); @@ -79,23 +81,21 @@ ldbm_back_delete( if ( !manageDSAit && is_entry_referral( e ) ) { /* parent is a referral, don't allow add */ /* parent is an alias, don't allow add */ - struct berval **refs = get_entry_referrals( be, - conn, op, e, dn->bv_val, LDAP_SCOPE_DEFAULT ); + BerVarray refs = get_entry_referrals( be, + conn, op, e ); #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "ldbm_back_delete: entry (%s) is a referral.\n", - e->e_dn )); + LDAP_LOG( BACK_LDBM, INFO, + "ldbm_back_delete: entry (%s) is a referral.\n", e->e_dn, 0, 0 ); #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 ); - ber_bvecfree( refs ); + if ( refs ) ber_bvarray_free( refs ); rc = 1; goto return_results; @@ -104,11 +104,11 @@ ldbm_back_delete( if ( has_children( be, e ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_delete: (%s) is a non-leaf node.\n", dn )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_delete: (%s) is a non-leaf node.\n", dn->bv_val, 0,0); #else Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n", - dn, 0, 0); + dn->bv_val, 0, 0); #endif send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, @@ -117,11 +117,12 @@ ldbm_back_delete( } /* delete from parent's id2children entry */ - if( (pdn = dn_parent( be, e->e_ndn )) != NULL && pdn[ 0 ] != '\0' ) { - if( (p = dn2entry_w( be, pdn, NULL )) == NULL) { + if( !be_issuffix( be, &e->e_nname ) && (dnParent( &e->e_nname, &pdn ), + pdn.bv_len) ) { + if( (p = dn2entry_w( be, &pdn, NULL )) == NULL) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_delete: parent of (%s) does not exist\n", dn )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_delete: parent of (%s) does not exist\n", dn, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<=- ldbm_back_delete: parent does not exist\n", @@ -135,12 +136,12 @@ ldbm_back_delete( /* check parent for "children" acl */ if ( ! access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ) ) + children, NULL, ACL_WRITE, NULL ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_delete: no access to parent of (%s)\n", - dn->bv_val )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_delete: no access to parent of (%s)\n", + dn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<=- ldbm_back_delete: no access to parent\n", 0, @@ -155,19 +156,19 @@ ldbm_back_delete( } else { /* no parent, must be root to delete */ if( ! be_isroot( be, &op->o_ndn ) ) { - if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) { + if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) { p = (Entry *)&slap_entry_root; rc = access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ); + children, NULL, ACL_WRITE, NULL ); p = NULL; /* check parent for "children" acl */ if ( ! rc ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + LDAP_LOG( BACK_LDBM, ERR, "ldbm_back_delete: no access " - "to parent of ("")\n" )); + "to parent of ("")\n", 0, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<=- ldbm_back_delete: no " @@ -182,9 +183,9 @@ ldbm_back_delete( } else { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, + LDAP_LOG( BACK_LDBM, ERR, "ldbm_back_delete: (%s) has no " - "parent & not a root.\n", dn )); + "parent & not a root.\n", dn, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "<=- ldbm_back_delete: no parent & " @@ -197,17 +198,13 @@ ldbm_back_delete( goto return_results; } } - - ldap_pvt_thread_mutex_lock(&li->li_root_mutex); - rootlock = 1; } /* delete from dn2id mapping */ - if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) { + if ( dn2id_delete( be, &e->e_nname, e->e_id ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_delete: (%s) operations error\n", - dn->bv_val )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 ); #else Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: operations error %s\n", @@ -222,9 +219,8 @@ ldbm_back_delete( /* delete from disk and cache */ if ( id2entry_delete( be, e ) != 0 ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ERR, - "ldbm_back_delete: (%s) operations error\n", - dn->bv_val )); + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_delete: (%s) operations error\n", dn->bv_val, 0, 0 ); #else Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: operations error %s\n", @@ -249,13 +245,10 @@ return_results:; cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } - /* free entry and writer lock */ cache_return_entry_w( &li->li_cache, e ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + return rc; }