X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdelete.c;h=1e9a3989c0d07c054f360151f144c8e0d96d5159;hb=aa3b69eb32f3292340b1af8c7733aafaf6f2f6e5;hp=c216f6b90136657ac87fbd3af4a2dfc43e2e83e8;hpb=693fb9424a17799192116e8ce007c4070798cdeb;p=openldap

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index c216f6b901..1e9a3989c0 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-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,170 +18,256 @@
 
 int
 ldbm_back_delete(
-    Backend	*be,
-    Connection	*conn,
     Operation	*op,
-    const char	*dn,
-    const char	*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;
 
-	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
+#ifdef NEW_LOGGING
+	LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0 );
+#else
+	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", op->o_req_dn.bv_val, 0, 0);
+#endif
 
-	/* get entry with writer lock */
-	if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
-		char *matched_dn = NULL;
-		struct berval **refs = NULL;
+	/* grab giant lock for writing */
+	ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock);
 
+	/* get entry with writer lock */
+	if ( (e = dn2entry_w( op->o_bd, &op->o_req_ndn, &matched )) == NULL ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_delete: no such object %s\n", op->o_req_dn.bv_val, 0, 0 );
+#else
 		Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_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 )
+			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 = default_referral;
+			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);
 
-		if ( matched != NULL ) {
-			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 );
 
 		return( -1 );
 	}
 
-#ifdef SLAPD_CHILD_MODIFICATION_WITH_ENTRY_ACL
-	if ( ! access_allowed( be, conn, op, e,
-		"entry", NULL, ACL_WRITE ) )
+	/* check entry for "entry" acl */
+#ifdef LDAP_CACHING
+	if( !op->o_caching_on ) {
+#endif /* LDAP_CACHING */
+	if ( ! access_allowed( op, e,
+		entry, NULL, ACL_WRITE, NULL ) )
 	{
-		Debug(LDAP_DEBUG_ARGS,
-			"<=- ldbm_back_delete: insufficient access %s\n",
-			dn, 0, 0);
-		send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-			NULL, NULL, NULL, NULL );
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, ERR, 
+			"ldbm_back_delete: no write access to entry of (%s)\n", 
+			op->o_req_dn.bv_val, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_TRACE,
+			"<=- ldbm_back_delete: no write access to entry\n", 0,
+			0, 0 );
+#endif
+
+		send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+			"no write access to entry" );
+
+		rc = 1;
 		goto return_results;
 	}
-#endif
 
-    if ( !manageDSAit && is_entry_referral( e ) ) {
+	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 );
+		rs->sr_ref = get_entry_referrals( op, e );
 
+#ifdef NEW_LOGGING
+		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 );
+		rs->sr_err = LDAP_REFERRAL;
+		rs->sr_matched = e->e_name.bv_val;
+		send_ldap_result( op, rs );
 
-		ber_bvecfree( refs );
+		if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
 
 		rc = 1;
 		goto return_results;
 	}
 
-
-	if ( has_children( be, e ) ) {
+	if ( has_children( op->o_bd, e ) ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, ERR, 
+			   "ldbm_back_delete: (%s) is a non-leaf node.\n", op->o_req_dn.bv_val, 0,0);
+#else
 		Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
-			dn, 0, 0);
-		send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF,
-			NULL, "subtree delete not supported", NULL, NULL );
+			op->o_req_dn.bv_val, 0, 0);
+#endif
+
+		send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
+			"subtree delete not supported" );
 		goto return_results;
 	}
 
 	/* delete from parent's id2children entry */
-	if( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
-		if( (p = dn2entry_w( be, pdn, NULL )) == NULL) {
+	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) {
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, ERR, 
+				"ldbm_back_delete: parent of (%s) does not exist\n", op->o_req_dn, 0, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<=- ldbm_back_delete: parent does not exist\n",
 				0, 0, 0);
-			send_ldap_result( conn, op, LDAP_OTHER,
-				NULL, "could not locate parent of entry", NULL, NULL );
+#endif
+
+			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_WRITE, NULL ) )
 		{
+#ifdef NEW_LOGGING
+			LDAP_LOG( BACK_LDBM, ERR, 
+				"ldbm_back_delete: no access to parent of (%s)\n", 
+				op->o_req_dn.bv_val, 0, 0 );
+#else
 			Debug( LDAP_DEBUG_TRACE,
 				"<=- ldbm_back_delete: no access to parent\n", 0,
 				0, 0 );
-			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-				NULL, NULL, NULL, NULL );
+#endif
+
+			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 ) ) {
-			Debug( LDAP_DEBUG_TRACE,
-				"<=- ldbm_back_delete: no parent & not root\n",
-				0, 0, 0);
-			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
-				NULL, NULL, NULL, NULL );
-			goto return_results;
-		}
+		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;
+				
+				rc = access_allowed( op, p,
+					children, NULL, ACL_WRITE, NULL );
+				p = NULL;
+								
+				/* check parent for "children" acl */
+				if ( ! rc ) {
+#ifdef NEW_LOGGING
+					LDAP_LOG( BACK_LDBM, ERR,
+						"ldbm_back_delete: no access "
+						"to parent of ("")\n", 0, 0, 0 );
+#else
+					Debug( LDAP_DEBUG_TRACE,
+						"<=- ldbm_back_delete: no "
+						"access to parent\n", 0, 0, 0 );
+#endif
 
-		ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
-		rootlock = 1;
+					send_ldap_error( op, rs, LDAP_INSUFFICIENT_ACCESS,
+						"no write access to parent" );
+					goto return_results;
+				}
+
+			} else {
+#ifdef NEW_LOGGING
+				LDAP_LOG( BACK_LDBM, ERR, 
+					"ldbm_back_delete: (%s) has no "
+					"parent & not a root.\n", op->o_ndn, 0, 0 );
+#else
+				Debug( LDAP_DEBUG_TRACE,
+					"<=- ldbm_back_delete: no parent & "
+					"not root\n", 0, 0, 0);
+#endif
+
+				send_ldap_error( op, rs,
+					LDAP_INSUFFICIENT_ACCESS,
+					NULL );
+				goto return_results;
+			}
+		}
 	}
+#ifdef LDAP_CACHING
+	}
+#endif /* LDAP_CACHING */
 
 	/* delete from dn2id mapping */
-	if ( dn2id_delete( be, e->e_ndn, e->e_id ) != 0 ) {
+	if ( dn2id_delete( op->o_bd, &e->e_nname, e->e_id ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, ERR, 
+			"ldbm_back_delete: (%s) operations error\n", op->o_req_dn.bv_val, 0, 0 );
+#else
 		Debug(LDAP_DEBUG_ARGS,
 			"<=- ldbm_back_delete: operations error %s\n",
-			dn, 0, 0);
-		send_ldap_result( conn, op, LDAP_OTHER,
-			NULL, "DN index delete failed", NULL, NULL );
+			op->o_req_dn.bv_val, 0, 0);
+#endif
+
+		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 ) {
+	if ( id2entry_delete( op->o_bd, e ) != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( BACK_LDBM, ERR, 
+			"ldbm_back_delete: (%s) operations error\n", op->o_req_dn.bv_val, 0, 0 );
+#else
 		Debug(LDAP_DEBUG_ARGS,
 			"<=- ldbm_back_delete: operations error %s\n",
-			dn, 0, 0);
-		send_ldap_result( conn, op, LDAP_OTHER,
-			NULL, "entry delete failed", NULL, NULL );
+			op->o_req_dn.bv_val, 0, 0);
+#endif
+
+		send_ldap_error( op, rs, LDAP_OTHER,
+			"entry delete failed" );
 		goto return_results;
 	}
 
-	send_ldap_result( conn, op, LDAP_SUCCESS,
-		NULL, NULL, NULL, NULL );
+	/* delete attribute indices */
+	(void) index_entry_del( op, e );
+
+	rs->sr_err = LDAP_SUCCESS;
+	send_ldap_result( op, rs );
 	rc = 0;
 
 return_results:;
-	if ( pdn != NULL ) free(pdn);
-
 	if( p != NULL ) {
 		/* free parent and writer lock */
 		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;
 }