)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- char *dn = NULL, *pdn = NULL;
+ char *pdn;
Entry *p = NULL;
- int rc;
+ int rootlock = 0;
+ int rc = -1;
- dn = dn_normalize( ch_strdup( e->e_dn ) );
+ Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0);
- Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", dn, 0, 0);
+ /* nobody else can add until we lock our parent */
+ ldap_pvt_thread_mutex_lock(&li->li_add_mutex);
- if ( ( dn2id( be, dn ) ) != NOID ) {
+ if ( ( dn2id( be, e->e_ndn ) ) != NOID ) {
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
entry_free( e );
- free( dn );
send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" );
return( -1 );
}
- /* XXX race condition here til we cache_add_entry_lock below XXX */
-
if ( global_schemacheck && oc_schema_check( e ) != 0 ) {
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+
Debug( LDAP_DEBUG_TRACE, "entry failed schema check\n",
0, 0, 0 );
- /* XXX this should be ok, no other thread should have access
- * because e hasn't been added to the cache yet
- */
entry_free( e );
- free( dn );
send_ldap_result( conn, op, LDAP_OBJECT_CLASS_VIOLATION, "",
"" );
return( -1 );
}
- /*
- * Try to add the entry to the cache, assign it a new dnid
- * and mark it locked. This should only fail if the entry
- * already exists.
- */
-
- e->e_id = next_id( be );
- if ( cache_add_entry_lock( &li->li_cache, e, ENTRY_STATE_CREATING )
- != 0 ) {
- Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0,
- 0 );
- next_id_return( be, e->e_id );
-
- /* XXX this should be ok, no other thread should have access
- * because e hasn't been added to the cache yet
- */
- entry_free( e );
- free( dn );
- send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" );
- return( -1 );
- }
-
/*
* Get the parent dn and see if the corresponding entry exists.
* If the parent does not exist, only allow the "root" user to
* add the entry.
*/
- if ( (pdn = dn_parent( be, dn )) != NULL ) {
- char *matched;
- /* no parent */
+ if ( (pdn = dn_parent( be, e->e_ndn )) != NULL ) {
+ char *matched = NULL;
- /* get entry with reader lock */
- if ( (p = dn2entry_r( be, pdn, &matched )) == NULL ) {
+ /* get parent with writer lock */
+ if ( (p = dn2entry_w( be, pdn, &matched )) == NULL ) {
+ 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,
free( matched );
}
- rc = -1;
- goto return_results;
+ entry_free( e );
+ free( pdn );
+ return -1;
+ }
+
+ /* don't need the add lock anymore */
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+
+ free(pdn);
+
+ if ( matched != NULL ) {
+ free( matched );
}
- if ( ! access_allowed( be, conn, op, p, "children", NULL,
- op->o_dn, ACL_WRITE ) ) {
+ if ( ! access_allowed( be, conn, op, p,
+ "children", NULL, ACL_WRITE ) )
+ {
Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
0, 0 );
send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
"", "" );
- rc = -1;
- goto return_results;
+ /* free parent and writer lock */
+ cache_return_entry_w( &li->li_cache, p );
+
+ entry_free( e );
+ return -1;
}
+
} else {
- if ( ! be_isroot( be, op->o_dn ) ) {
+ /* no parent, must be adding entry to root */
+ if ( ! be_isroot( be, op->o_ndn ) ) {
+ 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,
"", "" );
- rc = -1;
- goto return_results;
+ entry_free( e );
+ return -1;
}
+
+ /*
+ * no parent, acquire the root write lock
+ * and release the add lock.
+ */
+ ldap_pvt_thread_mutex_lock(&li->li_root_mutex);
+ rootlock = 1;
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+ }
+
+ /* acquire required reader/writer lock */
+ if (entry_rdwr_lock(e, 1)) {
+ 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);
+ }
+
+ Debug( LDAP_DEBUG_ANY, "add: could not lock entry\n",
+ 0, 0, 0 );
+
+ entry_free(e);
+
+ send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
+ return( -1 );
+ }
+
+ e->e_id = next_id( be );
+
+ /*
+ * Try to add the entry to the cache, assign it a new dnid.
+ * This should only fail if the entry already exists.
+ */
+
+ 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 */
+ 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_free( e );
+
+ send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, "", "" );
+ return( -1 );
}
/*
0, 0 );
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
- rc = -1;
goto return_results;
}
0, 0 );
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, "", "" );
- rc = -1;
goto return_results;
}
/* 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, "", "" );
- rc = -1;
goto return_results;
}
- /* acquire writer lock */
- entry_rdwr_lock(e, 1);
-
/* id2entry index */
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, "", "" );
- rc = -1;
goto return_results;
}
rc = 0;
return_results:;
+ if (p != NULL) {
+ /* free parent and writer lock */
+ cache_return_entry_w( &li->li_cache, p );
+ }
- if ( dn != NULL )
- free( dn );
- if ( pdn != NULL )
- free( pdn );
+ if ( rootlock ) {
+ /* release root lock */
+ ldap_pvt_thread_mutex_unlock(&li->li_root_mutex);
+ }
cache_set_state( &li->li_cache, e, 0 );
/* free entry and writer lock */
cache_return_entry_w( &li->li_cache, e );
- /* free entry and reader lock */
- if (p != NULL) {
- cache_return_entry_r( &li->li_cache, p );
- }
-
return( rc );
}
projects / openldap / blobdiff