X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdelete.c;h=1ba9c5483a76c6275da70dcc4840bcd2795197c5;hb=d7a1eb0ea2a8bd8989459aae8caf02830d93281d;hp=550c476b91e48813bf7eb748c0c5d5cc7852c7be;hpb=09cddf9188d3e6b10e8a835c1227e4767407b569;p=openldap

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 550c476b91..1ba9c5483a 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -1,7 +1,7 @@
 /* delete.c - bdb backend delete routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,293 +14,500 @@
 #include "external.h"
 
 int
-bdb_delete(
-	BackendDB	*be,
-	Connection	*conn,
-	Operation	*op,
-	const char	*dn,
-	const char	*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;
-	char	*pdn = NULL;
-	Entry	*e, *p = NULL;
-	int	rc;
-	const char *text;
+	struct berval	pdn = {0, NULL};
+	Entry	*e = NULL;
+	Entry	*p = NULL;
+	EntryInfo	*ei = NULL, *eip = NULL;
 	int		manageDSAit = get_manageDSAit( op );
 	AttributeDescription *children = slap_schema.si_ad_children;
-	DB_TXN		*ltid = NULL;
+	AttributeDescription *entry = slap_schema.si_ad_entry;
+	DB_TXN		*ltid = NULL, *lt2;
 	struct bdb_op_info opinfo;
 
-	Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n", dn, 0, 0 );
+	u_int32_t	locker = 0;
+	DB_LOCK		lock, plock;
 
-	if (0) {
+	int		noop = 0;
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+	Operation* ps_list;
+#endif
+
+#ifdef NEW_LOGGING
+	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",
+		op->o_req_dn.bv_val, 0, 0 );
+#endif
+
+	if( 0 ) {
 retry:	/* transaction retry */
-		Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n", 0, 0, 0 );
-		rc = txn_abort( ltid );
+		if( e != NULL ) {
+			bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+			e = NULL;
+		}
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, DETAIL1, 
+			"==> bdb_delete: retrying...\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
+			0, 0, 0 );
+#endif
+		rs->sr_err = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
-		if( rc != 0 ) {
-			rc = LDAP_OTHER;
-			text = "internal error";
+		op->o_do_not_cache = opinfo.boi_acl_cache;
+		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, &ltid, 0 );
-	text = NULL;
-	if( rc != 0 ) {
+	rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+		bdb->bi_db_opflags );
+	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(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 );
-		rc = LDAP_OTHER;
-		text = "internal error";
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
 		goto return_results;
 	}
 
-	opinfo.boi_bdb = be;
+	locker = TXN_ID ( ltid );
+
+	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;
 
-	/* get entry for read/modify/write */
-	rc = bdb_dn2entry( be, ltid, ndn, &e, &matched, DB_RMW );
+	if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
+		dnParent( &op->o_req_ndn, &pdn );
+	}
+
+	/* get entry */
+	rs->sr_err = bdb_dn2entry( op->o_bd, ltid, &op->o_req_ndn, &ei, 1,
+		locker, &lock, op->o_tmpmemctx );
 
-	switch( rc ) {
+	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:
-		rc = LDAP_OTHER;
-		text = "internal error";
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "internal error";
 		goto return_results;
 	}
 
-	if ( e == NULL ) {
-		char *matched_dn = NULL;
-		struct berval **refs;
+	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 );
+#else
+			Debug( LDAP_DEBUG_TRACE,
+				"<=- bdb_delete: parent does not exist\n",
+				0, 0, 0);
+#endif
+			rs->sr_err = LDAP_OTHER;
+			rs->sr_text = "could not locate parent of entry";
+			goto return_results;
+		}
+
+		/* check parent for "children" acl */
+		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 ( !rs->sr_err  ) {
+			switch( opinfo.boi_err ) {
+			case DB_LOCK_DEADLOCK:
+			case DB_LOCK_NOTGRANTED:
+				goto retry;
+			}
+
+#ifdef NEW_LOGGING
+			LDAP_LOG ( OPERATION, DETAIL1, 
+				"<=- bdb_delete: no write access to parent\n", 0, 0, 0 );
+#else
+			Debug( LDAP_DEBUG_TRACE,
+				"<=- bdb_delete: no write access to parent\n",
+				0, 0, 0 );
+#endif
+			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( 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 */
+				rs->sr_err = access_allowed( op, p,
+					children, NULL, ACL_WRITE, NULL );
+
+				p = NULL;
+
+				if ( !rs->sr_err  ) {
+					switch( opinfo.boi_err ) {
+					case DB_LOCK_DEADLOCK:
+					case DB_LOCK_NOTGRANTED:
+						goto retry;
+					}
+
+#ifdef NEW_LOGGING
+					LDAP_LOG ( OPERATION, DETAIL1, 
+						"<=- bdb_delete: no access to parent\n", 0, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_TRACE,
+						"<=- bdb_delete: no access "
+						"to parent\n", 0, 0, 0 );
+#endif
+					rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+					rs->sr_text = "no write access to parent";
+					goto return_results;
+				}
+
+			} else {
+#ifdef NEW_LOGGING
+				LDAP_LOG ( OPERATION, DETAIL1, 
+					"<=- bdb_delete: no parent and not root\n", 0, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE,
+					"<=- bdb_delete: no parent "
+					"and not root\n", 0, 0, 0);
+#endif
+				rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+				goto return_results;
+			}
+		}
+	}
+
+	if ( e == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ARGS, 
+			"<=- 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, 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,
-					dn, LDAP_SCOPE_DEFAULT )
+			rs->sr_matched = ch_strdup( matched->e_dn );
+			rs->sr_ref = is_entry_referral( matched )
+				? get_entry_referrals( op, matched )
 				: NULL;
-			bdb_entry_return( be, matched );
+			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_bvecfree( 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;
 	}
 
-	pdn = dn_parent( be, ndn );
+	rs->sr_err = access_allowed( op, e,
+		entry, NULL, ACL_WRITE, NULL );
 
-	if( pdn != NULL && *pdn != '\0' ) {
-		/* get parent */
-		rc = bdb_dn2entry( be, ltid, pdn, &p, NULL, 0 );
-
-		ch_free( pdn );
-
-		switch( rc ) {
-		case 0:
-		case DB_NOTFOUND:
-			break;
+	if ( !rs->sr_err  ) {
+		switch( opinfo.boi_err ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
 			goto retry;
-		default:
-			rc = LDAP_OTHER;
-			text = "internal error";
-			goto return_results;
-		}
-
-		if( p == NULL) {
-			Debug( LDAP_DEBUG_TRACE,
-				"<=- bdb_delete: parent does not exist\n",
-				0, 0, 0);
-			rc = LDAP_OTHER;
-			text = "could not locate parent of entry";
-			goto return_results;
 		}
 
-		/* check parent for "children" acl */
-		rc = access_allowed( be, conn, op, p,
-			children, NULL, ACL_WRITE );
-
-		bdb_entry_return( be, p );
-		p = NULL;
-
-		if ( !rc  ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"<=- bdb_delete: no access to parent\n",
-				0, 0, 0 );
-			rc = LDAP_INSUFFICIENT_ACCESS;
-			goto return_results;
-		}
-
-	} else {
-		ch_free( pdn );
-
-		/* no parent, must be root to delete */
-		if( ! be_isroot( be, op->o_ndn ) ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"<=- bdb_delete: no parent and not root\n",
-				0, 0, 0);
-			rc = LDAP_INSUFFICIENT_ACCESS;
-			goto return_results;
-		}
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, DETAIL1, 
+			"<=- bdb_delete: no write access to entry\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"<=- bdb_delete: no write access to entry\n",
+			0, 0, 0 );
+#endif
+		rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+		rs->sr_text = "no write access to entry";
+		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, LDAP_SCOPE_DEFAULT );
+		/* entry is a referral, don't allow delete */
+		rs->sr_ref = get_entry_referrals( op, e );
 
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, DETAIL1, 
+			"<=- bdb_delete: entry is referral\n", 0, 0, 0 );
+#else
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_delete: entry is referral\n",
 			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_bvecfree( 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_ndn );
-	if( rc != DB_NOTFOUND ) {
-		switch( rc ) {
+	/* nested transaction */
+	rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, ltid, &lt2, 
+		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", op->o_req_dn.bv_val, 0, 0 );
+#else
 			Debug(LDAP_DEBUG_ARGS,
 				"<=- bdb_delete: non-leaf %s\n",
-				dn, 0, 0);
-			rc = LDAP_NOT_ALLOWED_ON_NONLEAF;
-			text = "subtree delete not supported";
+				op->o_req_dn.bv_val, 0, 0);
+#endif
+			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(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 );
-			rc = LDAP_OTHER;
-			text = "internal error";
+				db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+			rs->sr_err = LDAP_OTHER;
+			rs->sr_text = "internal error";
 		}
 		goto return_results;
 	}
 
 	/* delete from dn2id */
-	rc = bdb_dn2id_delete( be, ltid, e->e_ndn, e->e_id );
-	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(rs->sr_err), rs->sr_err, 0 );
+#else
 		Debug(LDAP_DEBUG_ARGS,
 			"<=- bdb_delete: dn2id failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		text = "DN index delete failed";
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		rs->sr_text = "DN index 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 ) {
+	/* delete from id2entry */
+	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;
 		}
-		Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
-			0, 0, 0 );
-		text = "entry index delete failed";
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"<=- bdb_delete: id2entry failed: %s (%d)\n", 
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#else
+		Debug(LDAP_DEBUG_ARGS,
+			"<=- bdb_delete: id2entry failed: %s (%d)\n",
+			db_strerror(rs->sr_err), rs->sr_err, 0 );
+#endif
+		rs->sr_text = "entry delete failed";
+		rs->sr_err = LDAP_OTHER;
 		goto return_results;
 	}
 
-	/* delete from id2entry */
-	if ( bdb_id2entry_delete( be, ltid, e->e_id ) != 0 ) {
-		switch( rc ) {
+	/* delete indices for old attributes */
+	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;
 		}
-		Debug(LDAP_DEBUG_ARGS,
-			"<=- bdb_delete: id2entry failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		text = "entry delete failed";
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, ERR, 
+			"<=- bdb_delete: entry index delete failed!\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
+			0, 0, 0 );
+#endif
+		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;
 	}
 
-	rc = txn_commit( ltid, 0 );
+#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( op->o_bd, ltid );
+	}
+	ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
+#endif
+
+	if( op->o_noop ) {
+		if ( ( rs->sr_err = TXN_ABORT( ltid ) ) != 0 ) {
+			rs->sr_text = "txn_abort (no-op) failed";
+		} else {
+			noop = 1;
+			rs->sr_err = LDAP_SUCCESS;
+		}
+	} else {
+		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(rs->sr_err), rs->sr_err );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: txn_commit failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
-		rc = LDAP_OTHER;
-		text = "commit failed";
+			"bdb_delete: txn_%s failed: %s (%d)\n",
+			op->o_noop ? "abort (no-op)" : "commit",
+			db_strerror(rs->sr_err), rs->sr_err );
+#endif
+		rs->sr_err = LDAP_OTHER;
+		rs->sr_text = "commit failed";
 
 	} else {
+#ifdef NEW_LOGGING
+		LDAP_LOG ( OPERATION, RESULTS, 
+			"bdb_delete: deleted%s id=%08lx db=\"%s\"\n",
+			op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+#else
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_add: added id=%08x dn=\"%s\"\n",
-			e->e_id, e->e_dn, 0 );
-		rc = LDAP_SUCCESS;
-		text = NULL;
+			"bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",
+			op->o_noop ? " (no-op)" : "",
+			e->e_id, e->e_dn );
+#endif
+		rs->sr_err = LDAP_SUCCESS;
+		rs->sr_text = NULL;
 	}
 
 return_results:
-	send_ldap_result( conn, op, LDAP_SUCCESS,
-		NULL, text, NULL, NULL );
+	send_ldap_result( op, rs );
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+        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,
+		TXN_CHECKPOINT( bdb->bi_dbenv,
 			bdb->bi_txn_cp_kbyte, bdb->bi_txn_cp_min, 0 );
 	}
 
 done:
 	/* free entry */
 	if( e != NULL ) {
-		bdb_entry_return( be, 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 ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}
 
-	return rc;
+	return ( ( rs->sr_err == LDAP_SUCCESS ) ? noop : rs->sr_err );
 }