X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fdelete.c;h=4687765c59bd8fd13917468fb42530753e9f1905;hb=0006ec0a46790567d3d49fcafce5ffaae08cdbf4;hp=9822076ef37b56a3efce4ae116f259242da0ce4c;hpb=2dd27b0786c511623c37a48f5935fb639cdc80dc;p=openldap

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 9822076ef3..4687765c59 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-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,13 +18,13 @@ bdb_delete(
 	BackendDB	*be,
 	Connection	*conn,
 	Operation	*op,
-	const char	*dn,
-	const char	*ndn
+	struct berval	*dn,
+	struct berval	*ndn
 )
 {
 	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 	Entry	*matched;
-	char	*pdn = NULL;
+	struct berval	pdn = {0, NULL};
 	Entry	*e, *p = NULL;
 	int	rc;
 	const char *text;
@@ -32,13 +32,22 @@ bdb_delete(
 	AttributeDescription *children = slap_schema.si_ad_children;
 	DB_TXN		*ltid = NULL;
 	struct bdb_op_info opinfo;
+#if 0
+	u_int32_t	lockid;
+	DB_LOCK		lock;
+#endif
 
-	Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n", dn, 0, 0 );
+	Debug( LDAP_DEBUG_ARGS, "==> bdb_delete: %s\n",
+		dn->bv_val, 0, 0 );
 
 	if( 0 ) {
 retry:	/* transaction retry */
-		Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n", 0, 0, 0 );
-		rc = txn_abort( ltid );
+		if( e != NULL ) {
+			bdb_cache_return_entry_w(&bdb->bi_cache, e);
+		}
+		Debug( LDAP_DEBUG_TRACE, "==> bdb_delete: retrying...\n",
+			0, 0, 0 );
+		rc = TXN_ABORT( ltid );
 		ltid = NULL;
 		op->o_private = NULL;
 		if( rc != 0 ) {
@@ -46,81 +55,46 @@ retry:	/* transaction retry */
 			text = "internal error";
 			goto return_results;
 		}
+		ldap_pvt_thread_yield();
 	}
 
-	if( bdb->bi_txn ) {
-		/* begin transaction */
-		rc = txn_begin( bdb->bi_dbenv, NULL, &ltid, 
-			bdb->bi_db_opflags );
-		text = NULL;
-		if( rc != 0 ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"bdb_delete: txn_begin failed: %s (%d)\n",
-				db_strerror(rc), rc, 0 );
-			rc = LDAP_OTHER;
-			text = "internal error";
-			goto return_results;
-		}
+	/* begin transaction */
+	rc = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, 
+		bdb->bi_db_opflags );
+	text = NULL;
+	if( rc != 0 ) {
+		Debug( LDAP_DEBUG_TRACE,
+			"bdb_delete: txn_begin failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+		rc = LDAP_OTHER;
+		text = "internal error";
+		goto return_results;
 	}
+#if 0
+	lockid = TXN_ID( ltid );
+#endif
 
 	opinfo.boi_bdb = be;
 	opinfo.boi_txn = ltid;
 	opinfo.boi_err = 0;
 	op->o_private = &opinfo;
 
-	/* get entry for read/modify/write */
-	rc = bdb_dn2entry( be, ltid, ndn, &e, &matched, DB_RMW );
-
-	switch( rc ) {
-	case 0:
-	case DB_NOTFOUND:
-		break;
-	case DB_LOCK_DEADLOCK:
-	case DB_LOCK_NOTGRANTED:
-		goto retry;
-	default:
-		rc = LDAP_OTHER;
-		text = "internal error";
-		goto return_results;
+	if ( !be_issuffix( be, ndn ) ) {
+		dnParent( ndn, &pdn );
 	}
 
-	if ( e == NULL ) {
-		char *matched_dn = NULL;
-		struct berval **refs;
-
-		Debug( LDAP_DEBUG_ARGS,
-			"<=- bdb_delete: no such object %s\n",
-			dn, 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, LDAP_SCOPE_DEFAULT )
-				: NULL;
-			bdb_entry_return( be, matched );
-			matched = NULL;
-
-		} else {
-			refs = referral_rewrite( default_referral,
-				NULL, dn, LDAP_SCOPE_DEFAULT );
+	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);
 		}
-
-		send_ldap_result( conn, op, LDAP_REFERRAL,
-			matched_dn, NULL, refs, NULL );
-
-		ber_bvecfree( refs );
-		free( matched_dn );
-
-		rc = -1;
-		goto done;
-	}
-
-	pdn = dn_parent( be, ndn );
-
-	if( pdn != NULL && *pdn != '\0' ) {
+#endif
 		/* get parent */
-		rc = bdb_dn2entry( be, ltid, pdn, &p, NULL, 0 );
+		rc = bdb_dn2entry_r( be, ltid, &pdn, &p, NULL, 0 );
 
 		switch( rc ) {
 		case 0:
@@ -146,11 +120,17 @@ retry:	/* transaction retry */
 
 		/* check parent for "children" acl */
 		rc = access_allowed( be, conn, op, p,
-			children, NULL, ACL_WRITE );
+			children, NULL, ACL_WRITE, NULL );
 
-		bdb_entry_return( be, p );
+		bdb_cache_return_entry_r(&bdb->bi_cache, p);
 		p = NULL;
 
+		switch( opinfo.boi_err ) {
+		case DB_LOCK_DEADLOCK:
+		case DB_LOCK_NOTGRANTED:
+			goto retry;
+		}
+
 		if ( !rc  ) {
 			Debug( LDAP_DEBUG_TRACE,
 				"<=- bdb_delete: no access to parent\n",
@@ -162,14 +142,21 @@ retry:	/* transaction retry */
 	} 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;
 
 				/* check parent for "children" acl */
 				rc = access_allowed( be, conn, op, p,
-					children, NULL, ACL_WRITE );
+					children, NULL, ACL_WRITE, NULL );
 				p = NULL;
 
+				switch( opinfo.boi_err ) {
+				case DB_LOCK_DEADLOCK:
+				case DB_LOCK_NOTGRANTED:
+					goto retry;
+				}
+
 				if ( !rc  ) {
 					Debug( LDAP_DEBUG_TRACE,
 						"<=- bdb_delete: no access "
@@ -186,13 +173,69 @@ retry:	/* transaction retry */
 				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 );
+
+	switch( rc ) {
+	case 0:
+	case DB_NOTFOUND:
+		break;
+	case DB_LOCK_DEADLOCK:
+	case DB_LOCK_NOTGRANTED:
+		goto retry;
+	default:
+		rc = LDAP_OTHER;
+		text = "internal error";
+		goto return_results;
+	}
+
+	if ( e == NULL ) {
+		char *matched_dn = NULL;
+		BerVarray refs;
+
+		Debug( LDAP_DEBUG_ARGS,
+			"<=- bdb_delete: no such object %s\n",
+			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 )
+				: NULL;
+			bdb_cache_return_entry_r(&bdb->bi_cache, matched );
+			matched = NULL;
+
+		} else {
+			refs = referral_rewrite( default_referral,
+				NULL, dn, LDAP_SCOPE_DEFAULT );
+		}
+
+		send_ldap_result( conn, op, LDAP_REFERRAL,
+			matched_dn, NULL, refs, NULL );
+
+		ber_bvarray_free( refs );
+		free( matched_dn );
+
+		rc = -1;
+		goto done;
 	}
 
 	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 */
+		BerVarray refs = get_entry_referrals( be,
+			conn, op, e );
 
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_delete: entry is referral\n",
@@ -201,13 +244,13 @@ retry:	/* transaction retry */
 		send_ldap_result( conn, op, LDAP_REFERRAL,
 			e->e_dn, NULL, refs, NULL );
 
-		ber_bvecfree( refs );
+		ber_bvarray_free( refs );
 
 		rc = 1;
 		goto done;
 	}
 
-	rc = bdb_dn2id_children( be, ltid, e->e_ndn );
+	rc = bdb_dn2id_children( be, ltid, &e->e_nname );
 	if( rc != DB_NOTFOUND ) {
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
@@ -216,7 +259,7 @@ retry:	/* transaction retry */
 		case 0:
 			Debug(LDAP_DEBUG_ARGS,
 				"<=- bdb_delete: non-leaf %s\n",
-				dn, 0, 0);
+				dn->bv_val, 0, 0);
 			rc = LDAP_NOT_ALLOWED_ON_NONLEAF;
 			text = "subtree delete not supported";
 			break;
@@ -231,7 +274,7 @@ retry:	/* transaction retry */
 	}
 
 	/* delete from dn2id */
-	rc = bdb_dn2id_delete( be, ltid, pdn, e );
+	rc = bdb_dn2id_delete( be, ltid, pdn.bv_val, e );
 	if ( rc != 0 ) {
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
@@ -247,9 +290,9 @@ retry:	/* transaction retry */
 		goto return_results;
 	}
 
-	/* delete indices for old attributes */
-	rc = bdb_index_entry_del( be, ltid, e, e->e_attrs );
-	if ( rc != LDAP_SUCCESS ) {
+	/* delete from id2entry */
+	rc = bdb_id2entry_delete( be, ltid, e );
+	if ( rc != 0 ) {
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
@@ -257,15 +300,16 @@ retry:	/* transaction retry */
 		default:
 			rc = LDAP_OTHER;
 		}
-		Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
-			0, 0, 0 );
-		text = "entry index delete failed";
+		Debug(LDAP_DEBUG_ARGS,
+			"<=- bdb_delete: id2entry failed: %s (%d)\n",
+			db_strerror(rc), rc, 0 );
+		text = "entry delete failed";
 		goto return_results;
 	}
 
-	/* delete from id2entry */
-	rc = bdb_id2entry_delete( be, ltid, e->e_id );
-	if ( rc != 0 ) {
+	/* delete indices for old attributes */
+	rc = bdb_index_entry_del( be, ltid, e, e->e_attrs );
+	if ( rc != LDAP_SUCCESS ) {
 		switch( rc ) {
 		case DB_LOCK_DEADLOCK:
 		case DB_LOCK_NOTGRANTED:
@@ -273,14 +317,12 @@ retry:	/* transaction 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";
+		Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
+			0, 0, 0 );
+		text = "entry index delete 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 ) {
@@ -289,30 +331,33 @@ retry:	/* transaction retry */
 	ldap_pvt_thread_mutex_unlock( &bdb->bi_lastid_mutex );
 #endif
 
-	if( bdb->bi_txn ) {
-		rc = txn_commit( ltid, 0 );
+	if( op->o_noop ) {
+		rc = TXN_ABORT( ltid );
+	} else {
+		rc = TXN_COMMIT( ltid, 0 );
 	}
 	ltid = NULL;
 	op->o_private = NULL;
 
 	if( rc != 0 ) {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_delete: txn_commit failed: %s (%d)\n",
-			db_strerror(rc), rc, 0 );
+			"bdb_delete: txn_%s failed: %s (%d)\n",
+			op->o_noop ? "abort (no-op)" : "commit",
+			db_strerror(rc), rc );
 		rc = LDAP_OTHER;
 		text = "commit failed";
 
 	} else {
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_delete: deleted id=%08lx dn=\"%s\"\n",
-			e->e_id, e->e_dn, 0 );
+			"bdb_delete: deleted%s id=%08lx dn=\"%s\"\n",
+			op->o_noop ? " (no-op)" : "",
+			e->e_id, e->e_dn );
 		rc = LDAP_SUCCESS;
 		text = NULL;
 	}
 
 return_results:
-	send_ldap_result( conn, op, LDAP_SUCCESS,
-		NULL, text, NULL, NULL );
+	send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
 
 	if(rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
 		ldap_pvt_thread_yield();
@@ -323,11 +368,11 @@ return_results:
 done:
 	/* free entry */
 	if( e != NULL ) {
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_w(&bdb->bi_cache, e);
 	}
 
 	if( ltid != NULL ) {
-		txn_abort( ltid );
+		TXN_ABORT( ltid );
 		op->o_private = NULL;
 	}