X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fadd.c;h=65d1d11370d0c9e29b65da6c32f97e17fd5fbb3e;hb=4d36fd5a3ed407b0a53004d1431f1669222138b4;hp=cdb76533eea9d8aaafa019113d5fc81d858142b5;hpb=4bc786f34b50aa301be6f5600f58a980070f481e;p=openldap diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c index cdb76533ee..65d1d11370 100644 --- a/servers/slapd/back-ldbm/add.c +++ b/servers/slapd/back-ldbm/add.c @@ -1,7 +1,7 @@ /* add.c - ldap ldbm back-end add 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 */ @@ -25,37 +25,45 @@ ldbm_back_add( ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; - char *pdn; + struct berval pdn; Entry *p = NULL; - int rootlock = 0; - int rc; - char *text; -#ifdef SLAPD_SCHEMA_NOT_COMPAT - static AttributeDescription *children = NULL; + int rc; + ID id = NOID; + const char *text = NULL; + AttributeDescription *children = slap_schema.si_ad_children; + char textbuf[SLAP_TEXT_BUFLEN]; + size_t textlen = sizeof textbuf; + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_add: %s\n", e->e_dn, 0, 0 ); #else - static const char *children = "children"; -#endif - - Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0); +#endif - /* nobody else can add until we lock our parent */ - ldap_pvt_thread_mutex_lock(&li->li_add_mutex); + /* grab giant lock for writing */ + ldap_pvt_thread_rdwr_wlock(&li->li_giant_rwlock); - if ( ( dn2id( be, e->e_ndn ) ) != NOID ) { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); - send_ldap_result( conn, op, LDAP_ALREADY_EXISTS, + if ( ( rc = dn2id( be, &e->e_nname, &id ) ) || id != NOID ) { + /* if (rc) something bad happened to ldbm cache */ + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + send_ldap_result( conn, op, + rc ? LDAP_OTHER : LDAP_ALREADY_EXISTS, NULL, NULL, NULL, NULL ); return( -1 ); } - rc = entry_schema_check( e, NULL, &text ); + rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen ); if ( rc != LDAP_SUCCESS ) { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: entry (%s) failed schema check.\n", e->e_dn, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n", text, 0, 0 ); +#endif send_ldap_result( conn, op, rc, NULL, text, NULL, NULL ); @@ -68,19 +76,19 @@ ldbm_back_add( * add the entry. */ - pdn = dn_parent( be, e->e_ndn ); + if ( be_issuffix( be, &e->e_nname ) ) { + pdn = slap_empty_bv; + } else { + dnParent( &e->e_nname, &pdn ); + } - if( pdn != NULL && *pdn != '\0' ) { + if( pdn.bv_len ) { Entry *matched = NULL; - assert( *pdn != '\0' ); - /* get parent with writer lock */ - if ( (p = dn2entry_w( be, pdn, &matched )) == NULL ) { - char *matched_dn; - struct berval **refs; - - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + if ( (p = dn2entry_w( be, &pdn, &matched )) == NULL ) { + char *matched_dn = NULL; + BerVarray refs; if ( matched != NULL ) { matched_dn = ch_strdup( matched->e_dn ); @@ -90,42 +98,50 @@ ldbm_back_add( cache_return_entry_r( &li->li_cache, matched ); } else { - matched_dn = NULL; - refs = default_referral; + refs = referral_rewrite( default_referral, + NULL, &e->e_name, LDAP_SCOPE_DEFAULT ); } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: Parent of (%s) does not exist.\n", + e->e_dn, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "parent does not exist\n", 0, 0, 0 ); +#endif - send_ldap_result( conn, op, LDAP_REFERRAL, - matched_dn, NULL, refs, NULL ); + send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn, + refs == NULL ? "parent does not exist" : "parent is referral", + refs, NULL ); - if( matched != NULL ) { - ber_bvecfree( refs ); - free( matched_dn ); - } + ber_bvarray_free( refs ); + free( matched_dn ); - free( pdn ); return -1; } - /* don't need the add lock anymore */ - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); - - free(pdn); - if ( ! access_allowed( be, conn, op, p, - children, NULL, ACL_WRITE ) ) + children, NULL, ACL_WRITE, NULL ) ) { /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: No write access to parent (%s).\n", + e->e_dn, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "no write access to parent\n", 0, 0, 0 ); +#endif + send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, NULL, "no write access to parent", NULL, NULL ); - return -1; } @@ -134,9 +150,16 @@ ldbm_back_add( /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); +#ifdef NEW_LOGGING + LDAP_LOG(BACK_LDBM, ERR, + "ldbm_back_add: Parent is an alias.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "parent is alias\n", 0, 0, 0 ); +#endif + send_ldap_result( conn, op, LDAP_ALIAS_PROBLEM, NULL, "parent is an alias", NULL, NULL ); @@ -147,53 +170,110 @@ ldbm_back_add( if ( is_entry_referral( p ) ) { /* parent is a referral, don't allow add */ char *matched_dn = ch_strdup( p->e_dn ); - struct berval **refs = is_entry_referral( p ) + BerVarray refs = is_entry_referral( p ) ? get_entry_referrals( be, conn, op, p ) : NULL; /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: Parent is referral.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "parent is referral\n", 0, 0, 0 ); +#endif + send_ldap_result( conn, op, LDAP_REFERRAL, matched_dn, NULL, refs, NULL ); - ber_bvecfree( refs ); + ber_bvarray_free( refs ); free( matched_dn ); return -1; } } else { - if(pdn != NULL) { - assert( *pdn == '\0' ); - free(pdn); + if(pdn.bv_val != NULL) { + assert( *pdn.bv_val == '\0' ); } /* no parent, must be adding entry to root */ - if ( !be_isroot( be, op->o_ndn ) && !be_issuffix( be, "" ) ) { - ldap_pvt_thread_mutex_unlock(&li->li_add_mutex); + if ( !be_isroot( be, &op->o_ndn ) ) { + if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) { + p = (Entry *)&slap_entry_root; + + rc = access_allowed( be, conn, op, p, + children, NULL, ACL_WRITE, NULL ); + p = NULL; + + if ( ! rc ) { + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: No write " + "access to parent (\"\").\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, + "no write access to parent\n", + 0, 0, 0 ); +#endif - Debug( LDAP_DEBUG_TRACE, "%s add denied\n", - pdn == NULL ? "suffix" : "entry at root", - 0, 0 ); + send_ldap_result( conn, op, + LDAP_INSUFFICIENT_ACCESS, + NULL, + "no write access to parent", + NULL, NULL ); - send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, - NULL, NULL, NULL, NULL ); + return -1; + } - return -1; - } + } else { + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); - /* - * 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); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: %s add denied.\n", + pdn.bv_val == NULL ? "suffix" + : "entry at root", 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, "%s add denied\n", + pdn.bv_val == NULL ? "suffix" + : "entry at root", 0, 0 ); +#endif + + send_ldap_result( conn, op, + LDAP_INSUFFICIENT_ACCESS, + NULL, NULL, NULL, NULL ); + + return -1; + } + } } - e->e_id = next_id( be ); + if ( next_id( be, &e->e_id ) ) { + if( p != NULL) { + /* free parent and writer lock */ + cache_return_entry_w( &li->li_cache, p ); + } + + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); + +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: next_id failed.\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_ANY, "ldbm_add: next_id failed\n", + 0, 0, 0 ); +#endif + + send_ldap_result( conn, op, LDAP_OTHER, + NULL, "next_id add failed", NULL, NULL ); + + return( -1 ); + } /* * Try to add the entry to the cache, assign it a new dnid. @@ -206,13 +286,15 @@ ldbm_back_add( cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: cache_add_entry_lock failed.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_ANY, "cache_add_entry_lock failed\n", 0, 0, 0 ); +#endif send_ldap_result( conn, op, rc > 0 ? LDAP_ALREADY_EXISTS : LDAP_OTHER, @@ -223,15 +305,16 @@ ldbm_back_add( rc = -1; - /* - * Add the entry to the attribute indexes, then add it to - * the id2children index, dn2id index, and the id2entry index. - */ - /* attribute indexes */ - if ( index_add_entry( be, e ) != 0 ) { - Debug( LDAP_DEBUG_TRACE, "index_add_entry failed\n", 0, + if ( index_entry_add( be, e, e->e_attrs ) != LDAP_SUCCESS ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: index_entry_add failed.\n", 0, 0, 0 ); +#else + Debug( LDAP_DEBUG_TRACE, "index_entry_add failed\n", 0, 0, 0 ); +#endif + send_ldap_result( conn, op, LDAP_OTHER, NULL, "index generation failed", NULL, NULL ); @@ -239,9 +322,16 @@ ldbm_back_add( } /* dn2id index */ - if ( dn2id_add( be, e->e_ndn, e->e_id ) != 0 ) { + if ( dn2id_add( be, &e->e_nname, e->e_id ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: dn2id_add failed.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "dn2id_add failed\n", 0, 0, 0 ); +#endif + /* FIXME: delete attr indices? */ + send_ldap_result( conn, op, LDAP_OTHER, NULL, "DN index generation failed", NULL, NULL ); @@ -250,9 +340,17 @@ ldbm_back_add( /* id2entry index */ if ( id2entry_add( be, e ) != 0 ) { +#ifdef NEW_LOGGING + LDAP_LOG( BACK_LDBM, ERR, + "ldbm_back_add: id2entry_add failed.\n", 0, 0, 0 ); +#else Debug( LDAP_DEBUG_TRACE, "id2entry_add failed\n", 0, 0, 0 ); - (void) dn2id_delete( be, e->e_ndn, e->e_id ); +#endif + + /* FIXME: delete attr indices? */ + (void) dn2id_delete( be, &e->e_nname, e->e_id ); + send_ldap_result( conn, op, LDAP_OTHER, NULL, "entry store failed", NULL, NULL ); @@ -261,7 +359,12 @@ ldbm_back_add( send_ldap_result( conn, op, LDAP_SUCCESS, NULL, NULL, NULL, NULL ); + + /* marks the entry as committed, so it is added to the cache; + * otherwise it is removed from the cache, but not destroyed; + * it will be destroyed by the caller */ rc = 0; + cache_entry_commit( e ); return_results:; if (p != NULL) { @@ -269,14 +372,14 @@ return_results:; cache_return_entry_w( &li->li_cache, p ); } - if ( rootlock ) { - /* release root lock */ - ldap_pvt_thread_mutex_unlock(&li->li_root_mutex); - } - if ( rc ) { - /* free entry and writer lock */ + /* + * in case of error, writer lock is freed + * and entry's private data is destroyed. + * otherwise, this is done when entry is released + */ cache_return_entry_w( &li->li_cache, e ); + ldap_pvt_thread_rdwr_wunlock(&li->li_giant_rwlock); } return( rc );