/* 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
*/
)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
- char *pdn;
+ struct berval pdn;
Entry *p = NULL;
int rootlock = 0;
- int rc;
+ int rc;
+ ID id = NOID;
const char *text = NULL;
AttributeDescription *children = slap_schema.si_ad_children;
char textbuf[SLAP_TEXT_BUFLEN];
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,"ldbm_back_add: %s\n",
- e->e_dn ));
+ e->e_dn ));
#else
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);
- if ( ( dn2id( be, e->e_ndn ) ) != NOID ) {
+ if ( ( rc = dn2id( be, &e->e_nname, &id ) ) || id != NOID ) {
+ /* if (rc) something bad happened to ldbm cache */
ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
- send_ldap_result( conn, op, LDAP_ALREADY_EXISTS,
+ send_ldap_result( conn, op,
+ rc ? LDAP_OPERATIONS_ERROR : LDAP_ALREADY_EXISTS,
NULL, NULL, NULL, NULL );
return( -1 );
}
- rc = entry_schema_check( e, NULL, &text, textbuf, textlen );
+ rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: entry (%s) failed schema check.\n",
- e->e_dn ));
+ "ldbm_back_add: entry (%s) failed schema check.\n",
+ e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "entry failed schema check: %s\n",
text, 0, 0 );
* add the entry.
*/
- pdn = dn_parent( be, e->e_ndn );
+ pdn.bv_val = dn_parent( be, e->e_ndn );
+ if (pdn.bv_val && pdn.bv_val[0])
+ pdn.bv_len = e->e_nname.bv_len - (pdn.bv_val - e->e_ndn);
+ else
+ pdn.bv_len = 0;
- 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;
+ if ( (p = dn2entry_w( be, &pdn, &matched )) == NULL ) {
+ char *matched_dn = NULL;
+ BVarray refs;
ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
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 );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: Parent of (%s) does not exist.\n",
- e->e_dn ));
+ "ldbm_back_add: Parent of (%s) does not exist.\n",
+ e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "parent does not exist\n",
0, 0, 0 );
#endif
-
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 );
- }
+ 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 ) )
{
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 )
+ BVarray refs = is_entry_referral( p )
? get_entry_referrals( be, conn, op, p )
: NULL;
send_ldap_result( conn, op, LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ 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, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+ p = (Entry *)&slap_entry_root;
+
+ rc = access_allowed( be, conn, op, p,
+ children, NULL, ACL_WRITE );
+ p = NULL;
+
+ if ( ! rc ) {
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
#ifdef NEW_LOGGING
- LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
- "ldbm_back_add: %s add denied.\n",
- pdn == NULL ? "suffix" : "entry at root" ));
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_add: No write "
+ "access to parent (\"\").\n" ));
#else
- Debug( LDAP_DEBUG_TRACE, "%s add denied\n",
- pdn == NULL ? "suffix" : "entry at root",
- 0, 0 );
+ 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 );
- send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
- NULL, NULL, NULL, NULL );
+ return -1;
+ }
- return -1;
+ } else {
+ ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
+
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
+ "ldbm_back_add: %s add denied.\n",
+ pdn.bv_val == NULL ? "suffix"
+ : "entry at root" ));
+#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;
+ }
}
/*
ldap_pvt_thread_mutex_unlock(&li->li_add_mutex);
}
- e->e_id = next_id( be );
-
- if( e->e_id == NOID ) {
+ if ( next_id( be, &e->e_id ) ) {
if( p != NULL) {
/* free parent and writer lock */
cache_return_entry_w( &li->li_cache, p );
0 );
#endif
-
send_ldap_result( conn, op,
rc > 0 ? LDAP_ALREADY_EXISTS : LDAP_OTHER,
NULL, rc > 0 ? NULL : "cache add failed", NULL, NULL );
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 );
}
/* 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(( "backend", LDAP_LEVEL_ERR,
"ldbm_back_add: dn2id_add failed.\n" ));
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 );
0, 0 );
#endif
- (void) dn2id_delete( be, e->e_ndn, e->e_id );
+ /* 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 );
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) {
}
if ( rc ) {
- /* free entry and writer lock */
+ /* in case of error, writer lock is freed
+ * and entry's private data is destroyed */
cache_return_entry_w( &li->li_cache, e );
}
projects / openldap / blobdiff