/* delete.c - ldbm backend delete routine */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
int
ldbm_back_delete(
- Backend *be,
- Connection *conn,
Operation *op,
- struct berval *dn,
- struct berval *ndn
-)
+ SlapReply *rs )
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ struct ldbminfo *li = (struct ldbminfo *) op->o_bd->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;
+ AttributeDescription *entry = slap_schema.si_ad_entry;
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_delete: %s\n", dn->bv_val ));
-#else
- Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn->bv_val, 0, 0);
-#endif
+ Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0);
+
+ /* 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 ) {
- char *matched_dn = NULL;
- struct berval **refs;
-
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_delete: no such object %s\n", dn->bv_val ));
-#else
+ e = dn2entry_w( op->o_bd, &op->o_req_ndn, &matched );
+
+ /* FIXME : dn2entry() should return non-glue entry */
+ if ( e == NULL || ( !manageDSAit && is_entry_glue( e ))) {
Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
- dn->bv_val, 0, 0);
-#endif
+ op->o_req_dn.bv_val, 0, 0);
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 )
+ 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->bv_val, LDAP_SCOPE_DEFAULT );
+ rs->sr_ref = referral_rewrite( default_referral, 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);
- ber_bvecfree( refs );
- free( matched_dn );
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+ if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+ free( (char *)rs->sr_matched );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
return( -1 );
}
- if ( !manageDSAit && is_entry_referral( e ) ) {
+ /* check entry for "entry" acl */
+ if ( ! access_allowed( op, e, entry, NULL, ACL_WDEL, NULL ) )
+ {
+ Debug( LDAP_DEBUG_TRACE,
+ "<=- ldbm_back_delete: no write access to entry\n", 0,
+ 0, 0 );
+
+ send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+ "no write access to entry" );
+
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ goto return_results;
+ }
+
+ 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 );
-
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
- "ldbm_back_delete: entry (%s) is a referral.\n",
- e->e_dn ));
-#else
+ rs->sr_ref = get_entry_referrals( op, e );
+
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
-#endif
+ rs->sr_err = LDAP_REFERRAL;
+ rs->sr_matched = e->e_name.bv_val;
+ send_ldap_result( op, rs );
- send_ldap_result( conn, op, LDAP_REFERRAL,
- e->e_dn, NULL, refs, NULL );
-
- ber_bvecfree( refs );
-
- rc = 1;
+ if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ rc = LDAP_REFERRAL;
goto return_results;
}
-
- 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 ));
-#else
+ if ( has_children( op->o_bd, e ) ) {
Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
- dn, 0, 0);
-#endif
+ op->o_req_dn.bv_val, 0, 0);
- send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF,
- NULL, "subtree delete not supported", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
+ "subordinate objects must be deleted first");
goto return_results;
}
/* 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) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_delete: parent of (%s) does not exist\n", dn ));
-#else
+ if( !be_issuffix( op->o_bd, &e->e_nname ) && (dnParent( &e->e_nname, &pdn ),
+ pdn.bv_len) ) {
+ if( (p = dn2entry_w( op->o_bd, &pdn, NULL )) == NULL) {
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: parent does not exist\n",
0, 0, 0);
-#endif
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "could not locate parent of entry", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "could not locate parent of entry" );
goto return_results;
}
/* check parent for "children" acl */
- if ( ! access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE ) )
+ if ( ! access_allowed( op, p,
+ children, NULL, ACL_WDEL, NULL ) )
{
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_delete: no access to parent of (%s)\n",
- dn->bv_val ));
-#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no access to parent\n", 0,
0, 0 );
-#endif
- send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+ "no write access to parent" );
goto return_results;
}
} 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_isroot( op ) ) {
+ if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
+ || be_shadow_update( op ) ) {
p = (Entry *)&slap_entry_root;
- rc = access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE );
+ rc = access_allowed( op, p,
+ children, NULL, ACL_WDEL, NULL );
p = NULL;
/* check parent for "children" acl */
if ( ! rc ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_delete: no access "
- "to parent of ("")\n" ));
-#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no "
"access to parent\n", 0, 0, 0 );
-#endif
- send_ldap_result( conn, op,
- LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+ "no write access to parent" );
goto return_results;
}
} else {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_delete: (%s) has no "
- "parent & not a root.\n", dn ));
-#else
Debug( LDAP_DEBUG_TRACE,
"<=- ldbm_back_delete: no parent & "
"not root\n", 0, 0, 0);
-#endif
- send_ldap_result( conn, op,
+ send_ldap_error( op, rs,
LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ NULL );
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 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_delete: (%s) operations error\n",
- dn->bv_val ));
-#else
+ if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
Debug(LDAP_DEBUG_ARGS,
"<=- ldbm_back_delete: operations error %s\n",
- dn->bv_val, 0, 0);
-#endif
+ op->o_req_dn.bv_val, 0, 0);
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "DN index delete failed", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "DN index delete failed" );
goto return_results;
}
/* 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 ));
-#else
+ if ( id2entry_delete( op->o_bd, e ) != 0 ) {
Debug(LDAP_DEBUG_ARGS,
"<=- ldbm_back_delete: operations error %s\n",
- dn->bv_val, 0, 0);
-#endif
+ op->o_req_dn.bv_val, 0, 0);
- send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "entry delete failed", NULL, NULL );
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "entry delete failed" );
goto return_results;
}
/* delete attribute indices */
- (void) index_entry_del( be, e, e->e_attrs );
+ (void) index_entry_del( op, e );
- send_ldap_result( conn, op, LDAP_SUCCESS,
- NULL, NULL, NULL, NULL );
- rc = 0;
+ rs->sr_err = LDAP_SUCCESS;
+ send_ldap_result( op, rs );
+ rc = LDAP_SUCCESS;
return_results:;
if( p != NULL ) {
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;
}
projects / openldap / blobdiff