#include "external.h"
int
-bdb_delete(
- BackendDB *be,
- Connection *conn,
- Operation *op,
- struct berval *dn,
- struct berval *ndn
-)
+bdb_delete( Operation *op, SlapReply *rs )
{
- struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
Entry *matched;
struct berval pdn = {0, NULL};
Entry *e = NULL;
Entry *p = NULL;
- int rc;
- const char *text;
+ EntryInfo *ei = NULL, *eip = NULL;
int manageDSAit = get_manageDSAit( op );
AttributeDescription *children = slap_schema.si_ad_children;
AttributeDescription *entry = slap_schema.si_ad_entry;
- DB_TXN *ltid = NULL;
+ DB_TXN *ltid = NULL, *lt2;
struct bdb_op_info opinfo;
u_int32_t locker = 0;
- DB_LOCK lock;
-#if 0
- u_int32_t lockid;
- DB_LOCK lock;
-#endif
+ DB_LOCK lock, plock;
int noop = 0;
#endif
#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ARGS, "==> bdb_delete: %s\n", dn->bv_val, 0, 0 );
+ LDAP_LOG ( OPERATION, ARGS, "==> bdb_delete: %s\n", op->o_req_dn.bv_val, 0, 0 );
#else
Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n",
- dn->bv_val, 0, 0 );
+ op->o_req_dn.bv_val, 0, 0 );
#endif
if( 0 ) {
retry: /* transaction retry */
if( e != NULL ) {
bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+ e = NULL;
}
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, DETAIL1,
Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
0, 0, 0 );
#endif
- rc = TXN_ABORT( ltid );
+ rs->sr_err = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
op->o_do_not_cache = opinfo.boi_acl_cache;
- if( rc != 0 ) {
- rc = LDAP_OTHER;
- text = "internal error";
+ if( rs->sr_err != 0 ) {
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "internal error";
goto return_results;
}
ldap_pvt_thread_yield();
}
/* begin transaction */
- rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
+ rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
bdb->bi_db_opflags );
- text = NULL;
- if( rc != 0 ) {
+ rs->sr_text = NULL;
+ if( rs->sr_err != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"==> bdb_delete: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#endif
- rc = LDAP_OTHER;
- text = "internal error";
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "internal error";
goto return_results;
}
locker = TXN_ID ( ltid );
-#if 0
- lockid = TXN_ID( ltid );
-#endif
- opinfo.boi_bdb = be;
+ opinfo.boi_bdb = op->o_bd;
opinfo.boi_txn = ltid;
opinfo.boi_locker = locker;
opinfo.boi_err = 0;
opinfo.boi_acl_cache = op->o_do_not_cache;
op->o_private = &opinfo;
- if ( !be_issuffix( be, ndn ) ) {
- dnParent( ndn, &pdn );
+ if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+ dnParent( &op->o_req_ndn, &pdn );
}
- if( pdn.bv_len != 0 ) {
-#if 0
- if ( ltid ) {
- DBT obj;
- obj.data = pdn.bv_val-1;
- obj.size = pdn.bv_len+1;
- rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
- DB_LOCK_WRITE, &lock);
- }
-#endif
- /* get parent */
- rc = bdb_dn2entry_r( be, ltid, &pdn, &p, NULL, 0, locker, &lock );
+ /* get entry */
+ rs->sr_err = bdb_dn2entry( op->o_bd, ltid, &op->o_req_ndn, &ei, 1,
+ locker, &lock, op->o_tmpmemctx );
- switch( rc ) {
- case 0:
- case DB_NOTFOUND:
- break;
- case DB_LOCK_DEADLOCK:
- case DB_LOCK_NOTGRANTED:
- goto retry;
- case LDAP_BUSY:
- text = "ldap server busy";
- goto return_results;
- default:
- rc = LDAP_OTHER;
- text = "internal error";
- goto return_results;
- }
+ switch( rs->sr_err ) {
+ case 0:
+ case DB_NOTFOUND:
+ break;
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto retry;
+ case LDAP_BUSY:
+ rs->sr_text = "ldap server busy";
+ goto return_results;
+ default:
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "internal error";
+ goto return_results;
+ }
- if( p == NULL) {
+ if ( rs->sr_err == 0 ) {
+ e = ei->bei_e;
+ eip = ei->bei_parent;
+ bdb_cache_find_entry_id( op->o_bd, ltid, eip->bei_id, &eip,
+ 0, locker, &plock, op->o_tmpmemctx );
+ }
+ if ( eip ) {
+ p = eip->bei_e;
+ }
+
+ if ( pdn.bv_len != 0 ) {
+ if( p == NULL || !bvmatch( &pdn, &p->e_nname )) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, DETAIL1,
"<=- bdb_delete: parent does not exist\n", 0, 0, 0 );
"<=- bdb_delete: parent does not exist\n",
0, 0, 0);
#endif
- rc = LDAP_OTHER;
- text = "could not locate parent of entry";
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "could not locate parent of entry";
goto return_results;
}
/* check parent for "children" acl */
- rc = access_allowed( be, conn, op, p,
+ rs->sr_err = access_allowed( op, p,
children, NULL, ACL_WRITE, NULL );
bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, p);
p = NULL;
- if ( !rc ) {
+ if ( !rs->sr_err ) {
switch( opinfo.boi_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
"<=- bdb_delete: no write access to parent\n",
0, 0, 0 );
#endif
- rc = LDAP_INSUFFICIENT_ACCESS;
- text = "no write access to parent";
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+ rs->sr_text = "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, (struct berval *)&slap_empty_bv )
- || be_isupdate( be, &op->o_ndn ) ) {
+ if( ! be_isroot( op->o_bd, &op->o_ndn ) ) {
+ if ( be_issuffix( op->o_bd, (struct berval *)&slap_empty_bv )
+ || be_isupdate( op->o_bd, &op->o_ndn ) ) {
p = (Entry *)&slap_entry_root;
/* check parent for "children" acl */
- rc = access_allowed( be, conn, op, p,
+ rs->sr_err = access_allowed( op, p,
children, NULL, ACL_WRITE, NULL );
p = NULL;
- if ( !rc ) {
+ if ( !rs->sr_err ) {
switch( opinfo.boi_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
"<=- bdb_delete: no access "
"to parent\n", 0, 0, 0 );
#endif
- rc = LDAP_INSUFFICIENT_ACCESS;
- text = "no write access to parent";
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+ rs->sr_text = "no write access to parent";
goto return_results;
}
"<=- bdb_delete: no parent "
"and not root\n", 0, 0, 0);
#endif
- rc = LDAP_INSUFFICIENT_ACCESS;
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
}
-
-#if 0
- if ( ltid ) {
- DBT obj;
- obj.data = ",";
- obj.size = 1;
- rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
- DB_LOCK_WRITE, &lock);
- }
-#endif
- }
-
- /* get entry for read/modify/write */
- rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, DB_RMW, locker, &lock );
-
- switch( rc ) {
- case 0:
- case DB_NOTFOUND:
- break;
- case DB_LOCK_DEADLOCK:
- case DB_LOCK_NOTGRANTED:
- goto retry;
- case LDAP_BUSY:
- text = "ldap server busy";
- goto return_results;
- default:
- rc = LDAP_OTHER;
- text = "internal error";
- goto return_results;
}
if ( e == NULL ) {
- char *matched_dn = NULL;
- BerVarray refs;
-
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ARGS,
- "<=- bdb_delete: no such object %s\n", dn->bv_val, 0, 0);
+ "<=- bdb_delete: no such object %s\n", op->o_req_dn.bv_val, 0, 0);
#else
Debug( LDAP_DEBUG_ARGS,
"<=- bdb_delete: no such object %s\n",
- dn->bv_val, 0, 0);
+ op->o_req_dn.bv_val, 0, 0);
#endif
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;
bdb_unlocked_cache_return_entry_r(&bdb->bi_cache, matched);
matched = NULL;
} else {
- refs = referral_rewrite( default_referral,
- NULL, dn, 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 );
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
- ber_bvarray_free( refs );
- free( matched_dn );
+ ber_bvarray_free( rs->sr_ref );
+ free( (char *)rs->sr_matched );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
- rc = -1;
+ rs->sr_err = -1;
goto done;
}
- rc = access_allowed( be, conn, op, e,
+ rs->sr_err = access_allowed( op, e,
entry, NULL, ACL_WRITE, NULL );
- if ( !rc ) {
+ if ( !rs->sr_err ) {
switch( opinfo.boi_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
"<=- bdb_delete: no write access to entry\n",
0, 0, 0 );
#endif
- rc = LDAP_INSUFFICIENT_ACCESS;
- text = "no write access to entry";
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+ rs->sr_text = "no write access to entry";
goto return_results;
}
if ( !manageDSAit && is_entry_referral( e ) ) {
/* entry is a referral, don't allow delete */
- BerVarray refs = get_entry_referrals( be,
- conn, op, e );
+ rs->sr_ref = get_entry_referrals( op, e );
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, DETAIL1,
0, 0, 0 );
#endif
- send_ldap_result( conn, op, LDAP_REFERRAL,
- e->e_dn, NULL, refs, NULL );
+ rs->sr_err = LDAP_REFERRAL;
+ rs->sr_matched = e->e_name.bv_val;
+ send_ldap_result( op, rs );
- ber_bvarray_free( refs );
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
- rc = 1;
+ rs->sr_err = 1;
goto done;
}
- rc = bdb_dn2id_children( be, ltid, &e->e_nname, 0 );
- if( rc != DB_NOTFOUND ) {
- switch( rc ) {
+ /* nested transaction */
+ rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, <2,
+ bdb->bi_db_opflags );
+ rs->sr_text = NULL;
+ if( rs->sr_err != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_delete: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_delete: txn_begin(2) failed: %s (%d)\n",
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "internal error";
+ goto return_results;
+ }
+
+ /* Can't do it if we have kids */
+ rs->sr_err = bdb_dn2id_children( op, lt2, e );
+ if( rs->sr_err != DB_NOTFOUND ) {
+ switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
case 0:
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, DETAIL1,
- "<=- bdb_delete: non-leaf %s\n", dn->bv_val, 0, 0 );
+ "<=- bdb_delete: non-leaf %s\n", op->o_req_dn.bv_val, 0, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: non-leaf %s\n",
- dn->bv_val, 0, 0);
+ op->o_req_dn.bv_val, 0, 0);
#endif
- rc = LDAP_NOT_ALLOWED_ON_NONLEAF;
- text = "subtree delete not supported";
+ rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
+ rs->sr_text = "subtree delete not supported";
break;
default:
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: has_children failed %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: has_children failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#endif
- rc = LDAP_OTHER;
- text = "internal error";
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "internal error";
}
goto return_results;
}
/* delete from dn2id */
- rc = bdb_dn2id_delete( be, ltid, pdn.bv_val, e );
- if ( rc != 0 ) {
- switch( rc ) {
+ rs->sr_err = bdb_dn2id_delete( op->o_bd, lt2, pdn.bv_val, e );
+ if ( rs->sr_err != 0 ) {
+ switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
- default:
- rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
- "<=- bdb_delete: dn2id failed %s (%d)\n", db_strerror(rc), rc, 0 );
+ "<=- bdb_delete: dn2id failed %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: dn2id failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#endif
- text = "DN index delete failed";
+ rs->sr_text = "DN index delete failed";
+ rs->sr_err = LDAP_OTHER;
goto return_results;
}
/* delete from id2entry */
- rc = bdb_id2entry_delete( be, ltid, e );
- if ( rc != 0 ) {
- switch( rc ) {
+ rs->sr_err = bdb_id2entry_delete( op->o_bd, lt2, e );
+ if ( rs->sr_err != 0 ) {
+ switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
- default:
- rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"<=- bdb_delete: id2entry failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#else
Debug(LDAP_DEBUG_ARGS,
"<=- bdb_delete: id2entry failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ db_strerror(rs->sr_err), rs->sr_err, 0 );
#endif
- text = "entry delete failed";
+ rs->sr_text = "entry delete failed";
+ rs->sr_err = LDAP_OTHER;
goto return_results;
}
/* delete indices for old attributes */
- rc = bdb_index_entry_del( be, ltid, e, e->e_attrs );
- if ( rc != LDAP_SUCCESS ) {
- switch( rc ) {
+ rs->sr_err = bdb_index_entry_del( op, lt2, e );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
- default:
- rc = LDAP_OTHER;
}
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
0, 0, 0 );
#endif
- text = "entry index delete failed";
+ rs->sr_text = "entry index delete failed";
+ rs->sr_err = LDAP_OTHER;
+ goto return_results;
+ }
+ if ( TXN_COMMIT( lt2, 0 ) != 0 ) {
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "txn_commit(2) failed";
goto return_results;
}
#if 0 /* Do we want to reclaim deleted IDs? */
ldap_pvt_thread_mutex_lock( &bdb->bi_lastid_mutex );
if ( e->e_id == bdb->bi_lastid ) {
- bdb_last_id( be, ltid );
+ bdb_last_id( op->o_bd, ltid );
}
ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
#endif
if( op->o_noop ) {
- if ( ( rc = TXN_ABORT( ltid ) ) != 0 ) {
- text = "txn_abort (no-op) failed";
+ if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
+ rs->sr_text = "txn_abort (no-op) failed";
} else {
noop = 1;
- rc = LDAP_SUCCESS;
+ rs->sr_err = LDAP_SUCCESS;
}
} else {
- rc = TXN_COMMIT( ltid, 0 );
+ bdb_cache_delete_entry( &bdb->bi_cache, e, bdb->bi_dbenv,
+ locker, &lock );
+ rs->sr_err = TXN_COMMIT( ltid, 0 );
}
ltid = NULL;
op->o_private = NULL;
- if( rc != 0 ) {
+ if( rs->sr_err != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ERR,
"bdb_delete: txn_%s failed: %s (%d)\n",
- op->o_noop ? "abort (no-op)" : "commit", db_strerror(rc), rc );
+ op->o_noop ? "abort (no-op)" : "commit", db_strerror(rs->sr_err), rs->sr_err );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_delete: txn_%s failed: %s (%d)\n",
op->o_noop ? "abort (no-op)" : "commit",
- db_strerror(rc), rc );
+ db_strerror(rs->sr_err), rs->sr_err );
#endif
- rc = LDAP_OTHER;
- text = "commit failed";
+ rs->sr_err = LDAP_OTHER;
+ rs->sr_text = "commit failed";
} else {
#ifdef NEW_LOGGING
op->o_noop ? " (no-op)" : "",
e->e_id, e->e_dn );
#endif
- rc = LDAP_SUCCESS;
- text = NULL;
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_text = NULL;
}
return_results:
- send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ send_ldap_result( op, rs );
#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
- if ( rc == LDAP_SUCCESS && !noop ) {
- LDAP_LIST_FOREACH( ps_list, &bdb->psearch_list, link ) {
- bdb_psearch( be, conn, op, ps_list, e, LDAP_PSEARCH_BY_DELETE );
+ if ( rs->sr_err == LDAP_SUCCESS && !noop ) {
+ LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+ bdb_psearch( op, rs, ps_list, e, LDAP_PSEARCH_BY_DELETE );
}
}
#endif
- if(rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
+ if(rs->sr_err == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
TXN_CHECKPOINT( bdb->bi_dbenv,
bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
done:
/* free entry */
if( e != NULL ) {
- bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+ if ( rs->sr_err == LDAP_SUCCESS ) {
+ bdb_entry_return( e );
+ } else {
+ bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+ }
}
if( ltid != NULL ) {
op->o_private = NULL;
}
- return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
+ return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
}
projects / openldap / blobdiff