X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fdelete.c;h=b6ffa79e0e5b3edae3fb47be86c4af1937d6f0b3;hb=76ed17f7942d4e3810fa90b46143e615af311167;hp=c773929ffb43a64eb73ba3e3b7c28124a5655b08;hpb=58ea169c92679eb5b0598c2420c95c626ccac27d;p=openldap

diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index c773929ffb..b6ffa79e0e 100644
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -6,8 +6,8 @@
 #include <sys/socket.h>
 #include "slap.h"
 #include "back-ldbm.h"
+#include "proto-back-ldbm.h"
 
-extern Entry		*dn2entry();
 extern Attribute	*attr_find();
 
 int
@@ -22,7 +22,12 @@ ldbm_back_delete(
 	char		*matched = NULL;
 	Entry		*e;
 
-	if ( (e = dn2entry( be, dn, &matched )) == NULL ) {
+	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0);
+
+	/* get entry with writer lock */
+	if ( (e = dn2entry_w( be, dn, &matched )) == NULL ) {
+		Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: no such object %s\n",
+			dn, 0, 0);
 		send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT, matched, "" );
 		if ( matched != NULL ) {
 			free( matched );
@@ -30,38 +35,63 @@ ldbm_back_delete(
 		return( -1 );
 	}
 
+	Debug (LDAP_DEBUG_TRACE,
+		"rdwr_Xchk: readers_reading: %d writer_writing: %d\n",
+		e->e_rdwr.readers_reading, e->e_rdwr.writer_writing, 0);
+
+	/* check for deleted */
+
 	if ( has_children( be, e ) ) {
+		Debug(LDAP_DEBUG_ARGS, "<=- ldbm_back_delete: non leaf %s\n",
+			dn, 0, 0);
 		send_ldap_result( conn, op, LDAP_NOT_ALLOWED_ON_NONLEAF, "",
 		    "" );
-		cache_return_entry( &li->li_cache, e );
-		return( -1 );
+		goto error_return;
 	}
 
 	if ( ! access_allowed( be, conn, op, e, "entry", NULL, op->o_dn,
 	    ACL_WRITE ) ) {
+		Debug(LDAP_DEBUG_ARGS,
+			"<=- ldbm_back_delete: insufficient access %s\n",
+			dn, 0, 0);
 		send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, "", "" );
-		cache_return_entry( &li->li_cache, e );
-		return( -1 );
+		goto error_return;
 	}
 
+	Debug (LDAP_DEBUG_TRACE,
+		"rdwr_Xchk: readers_reading: %d writer_writing: %d\n",
+		e->e_rdwr.readers_reading, e->e_rdwr.writer_writing, 0);
+
 	/* XXX delete from parent's id2children entry XXX */
 
 	/* delete from dn2id mapping */
 	if ( dn2id_delete( be, e->e_dn ) != 0 ) {
+		Debug(LDAP_DEBUG_ARGS,
+			"<=- ldbm_back_delete: operations error %s\n",
+			dn, 0, 0);
 		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-		cache_return_entry( &li->li_cache, e );
-		return( -1 );
+		goto error_return;
 	}
 
 	/* delete from disk and cache */
 	if ( id2entry_delete( be, e ) != 0 ) {
+		Debug(LDAP_DEBUG_ARGS,
+			"<=- ldbm_back_delete: operations error %s\n",
+			dn, 0, 0);
 		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
-		cache_return_entry( &li->li_cache, e );
-		return( -1 );
+		goto error_return;
 	}
-	cache_return_entry( &li->li_cache, e );
+
+	/* free entry and writer lock */
+	cache_return_entry_w( &li->li_cache, e );
 
 	send_ldap_result( conn, op, LDAP_SUCCESS, "", "" );
 
 	return( 0 );
+
+error_return:;
+	/* free entry and writer lock */
+	cache_return_entry_w( &li->li_cache, e );
+
+	return( -1 );
 }