X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fadd.c;h=cdda78edb03242b51215b32e5c7a3f4955ca5537;hb=2c87d24f31d29bed606b443ef2d8e881b87207c7;hp=28fdc31e7b253c896435483f1666a53b012b5dcb;hpb=bf02252059a0b312980eec5aac33c35a4a127e21;p=openldap

diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c
index 28fdc31e7b..cdda78edb0 100644
--- a/servers/slapd/back-ldbm/add.c
+++ b/servers/slapd/back-ldbm/add.c
@@ -20,27 +20,25 @@ ldbm_back_add(
 )
 {
 	struct ldbminfo	*li = (struct ldbminfo *) be->be_private;
-	char		*dn, *pdn;
+	char		*pdn;
 	Entry		*p = NULL;
 	int			rootlock = 0;
 	int			rc = -1; 
 
-	dn = e->e_ndn;
-
-	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", dn, 0, 0);
+	Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0);
 
 	/* nobody else can add until we lock our parent */
-	pthread_mutex_lock(&li->li_add_mutex);
+	ldap_pvt_thread_mutex_lock(&li->li_add_mutex);
 
-	if ( ( dn2id( be, dn ) ) != NOID ) {
-		pthread_mutex_unlock(&li->li_add_mutex);
+	if ( ( dn2id( be, e->e_ndn ) ) != NOID ) {
+		ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 		entry_free( e );
 		send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" );
 		return( -1 );
 	}
 
 	if ( global_schemacheck && oc_schema_check( e ) != 0 ) {
-		pthread_mutex_unlock(&li->li_add_mutex);
+		ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 
 		Debug( LDAP_DEBUG_TRACE, "entry failed schema check\n",
 			0, 0, 0 );
@@ -57,12 +55,12 @@ ldbm_back_add(
 	 * add the entry.
 	 */
 
-	if ( (pdn = dn_parent( be, dn )) != NULL ) {
+	if ( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
 		char *matched = NULL;
 
 		/* get parent with writer lock */
 		if ( (p = dn2entry_w( be, pdn, &matched )) == NULL ) {
-			pthread_mutex_unlock(&li->li_add_mutex);
+			ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 			Debug( LDAP_DEBUG_TRACE, "parent does not exist\n", 0,
 			    0, 0 );
 			send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
@@ -78,7 +76,7 @@ ldbm_back_add(
 		}
 
 		/* don't need the add lock anymore */
-		pthread_mutex_unlock(&li->li_add_mutex);
+		ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 
 		free(pdn);
 
@@ -104,7 +102,7 @@ ldbm_back_add(
 	} else {
 		/* no parent, must be adding entry to root */
 		if ( ! be_isroot( be, op->o_ndn ) ) {
-			pthread_mutex_unlock(&li->li_add_mutex);
+			ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 			Debug( LDAP_DEBUG_TRACE, "no parent & not root\n", 0,
 			    0, 0 );
 			send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
@@ -118,9 +116,9 @@ ldbm_back_add(
 		 * no parent, acquire the root write lock
 		 * and release the add lock.
 		 */
-		pthread_mutex_lock(&li->li_root_mutex);
+		ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
 		rootlock = 1;
-		pthread_mutex_unlock(&li->li_add_mutex);
+		ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
 	}
 
 	/* acquire required reader/writer lock */
@@ -132,7 +130,7 @@ ldbm_back_add(
 
 		if ( rootlock ) {
 			/* release root lock */
-			pthread_mutex_unlock(&li->li_root_mutex);
+			ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
 		}
 
 		Debug( LDAP_DEBUG_ANY, "add: could not lock entry\n",
@@ -151,21 +149,21 @@ ldbm_back_add(
 	 * This should only fail if the entry already exists.
 	 */
 
-	if ( cache_add_entry_lock( &li->li_cache, e, ENTRY_STATE_CREATING ) != 0 ) {
+	if ( cache_add_entry( &li->li_cache, e, ENTRY_STATE_CREATING ) != 0 ) {
 		if( p != NULL) {
 			/* free parent and writer lock */
 			cache_return_entry_w( &li->li_cache, p ); 
 		}
 		if ( rootlock ) {
 			/* release root lock */
-			pthread_mutex_unlock(&li->li_root_mutex);
+			ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
 		}
 
 		Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0,
 		    0 );
 		next_id_return( be, e->e_id );
                 
-		entry_rdwr_unlock(e, 1);;
+		entry_rdwr_unlock(e, 1);
 		entry_free( e );
 
 		send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" );
@@ -199,7 +197,7 @@ ldbm_back_add(
 	}
 
 	/* dn2id index */
-	if ( dn2id_add( be, dn, e->e_id ) != 0 ) {
+	if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) {
 		Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0,
 		    0, 0 );
 		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
@@ -211,7 +209,7 @@ ldbm_back_add(
 	if ( id2entry_add( be, e ) != 0 ) {
 		Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0,
 		    0, 0 );
-		(void) dn2id_delete( be, dn );
+		(void) dn2id_delete( be, e->e_ndn );
 		send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
 
 		goto return_results;
@@ -228,7 +226,7 @@ return_results:;
 
 	if ( rootlock ) {
 		/* release root lock */
-		pthread_mutex_unlock(&li->li_root_mutex);
+		ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
 	}
 
 	cache_set_state( &li->li_cache, e, 0 );