/* add.c - ldap BerkeleyDB back-end add routine */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Entry *e )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
- char *pdn = NULL;
+ struct berval pdn;
Entry *p = NULL;
- int rc;
+ int rc;
const char *text;
char textbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof textbuf;
AttributeDescription *children = slap_schema.si_ad_children;
+ AttributeDescription *entry = slap_schema.si_ad_entry;
DB_TXN *ltid = NULL;
struct bdb_op_info opinfo;
-
+#ifdef BDB_SUBENTRIES
+ int subentry;
+#endif
+ u_int32_t locker = 0;
+ DB_LOCK lock;
+#if 0
+ u_int32_t lockid;
+ DB_LOCK lock;
+#endif
+ int noop = 0;
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+ Operation* ps_list;
+#endif
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "==> bdb_add: %s\n", e->e_dn, 0, 0);
+#endif
/* check entry's schema */
- rc = entry_schema_check( e, NULL, &text, textbuf, textlen );
+ rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: entry failed schema check: %s (%d)\n", text, rc, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: entry failed schema check: %s (%d)\n",
text, rc, 0 );
+#endif
goto return_results;
}
+#ifdef BDB_SUBENTRIES
+ subentry = is_entry_subentry( e );
+#endif
+
/*
* acquire an ID outside of the operation transaction
* to avoid serializing adds.
*/
rc = bdb_next_id( be, NULL, &e->e_id );
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: next_id failed (%d)\n", rc, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: next_id failed (%d)\n",
rc, 0, 0 );
+#endif
rc = LDAP_OTHER;
text = "internal error";
goto return_results;
}
if( 0 ) {
- /* transaction retry */
-retry: rc = txn_abort( ltid );
+retry: /* transaction retry */
+ if( p ) {
+ /* free parent and reader lock */
+ bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+ p = NULL;
+ }
+ rc = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
if( rc != 0 ) {
text = "internal error";
goto return_results;
}
+ ldap_pvt_thread_yield();
}
/* begin transaction */
- if( bdb->bi_txn ) {
- rc = txn_begin( bdb->bi_dbenv, NULL, <id,
- bdb->bi_db_opflags );
- text = NULL;
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_add: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- rc = LDAP_OTHER;
- text = "internal error";
- goto return_results;
- }
+ rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
+ bdb->bi_db_opflags );
+ text = NULL;
+ if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_add: txn_begin failed: %s (%d)\n",
+ db_strerror(rc), rc, 0 );
+#endif
+ rc = LDAP_OTHER;
+ text = "internal error";
+ goto return_results;
}
+ locker = TXN_ID ( ltid );
+#if 0
+ lockid = TXN_ID( ltid );
+#endif
+
opinfo.boi_bdb = be;
opinfo.boi_txn = ltid;
+ opinfo.boi_locker = locker;
opinfo.boi_err = 0;
op->o_private = &opinfo;
* If the parent does not exist, only allow the "root" user to
* 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 != 0 ) {
Entry *matched = NULL;
+#if 0
+ if ( ltid ) {
+ DBT obj;
+ obj.data = pdn.bv_val-1;
+ obj.size = pdn.bv_len+1;
+ rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
+ DB_LOCK_WRITE, &lock);
+ }
+#endif
+
/* get parent */
- rc = bdb_dn2entry( be, ltid, pdn, &p, &matched, 0 );
+ rc = bdb_dn2entry_r( be, ltid, &pdn, &p, &matched, 0, locker, &lock );
switch( rc ) {
case 0:
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
+ case LDAP_BUSY:
+ text = "ldap server busy";
+ goto return_results;
default:
rc = LDAP_OTHER;
text = "internal error";
if ( p == NULL ) {
char *matched_dn = NULL;
- struct berval **refs;
+ BerVarray refs;
if ( matched != NULL ) {
matched_dn = ch_strdup( matched->e_dn );
refs = is_entry_referral( matched )
- ? get_entry_referrals( be, conn, op,
- matched, e->e_dn, LDAP_SCOPE_DEFAULT )
+ ? get_entry_referrals( be, conn, op, matched )
: NULL;
- bdb_entry_return( be, matched );
+ bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, matched );
matched = NULL;
} else {
refs = referral_rewrite( default_referral,
- NULL, e->e_dn, LDAP_SCOPE_DEFAULT );
+ NULL, &e->e_name, LDAP_SCOPE_DEFAULT );
}
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: parent does not exist\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent does not exist\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
ch_free( matched_dn );
goto done;
}
- if ( ! access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE ) )
- {
+ rc = access_allowed( be, conn, op, p,
+ children, NULL, ACL_WRITE, NULL );
+
+ switch( opinfo.boi_err ) {
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto retry;
+ }
+
+ if ( ! rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: no write access to parent\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to parent\n",
0, 0, 0 );
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
text = "no write access to parent";
goto return_results;;
}
+#ifdef BDB_SUBENTRIES
+ if ( is_entry_subentry( p ) ) {
+ /* parent is a subentry, don't allow add */
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: parent is subentry\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is subentry\n",
+ 0, 0, 0 );
+#endif
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ text = "parent is a subentry";
+ goto return_results;;
+ }
+#endif
+#ifdef BDB_ALIASES
if ( is_entry_alias( p ) ) {
/* parent is an alias, don't allow add */
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: parent is alias\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is alias\n",
0, 0, 0 );
+#endif
rc = LDAP_ALIAS_PROBLEM;
text = "parent is an alias";
goto return_results;;
}
+#endif
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 )
- ? get_entry_referrals( be, conn, op, p,
- e->e_dn, LDAP_SCOPE_DEFAULT )
- : NULL;
+ char *matched_dn = p->e_dn;
+ BerVarray refs = get_entry_referrals( be, conn, op, p );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: parent is referral\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: parent is referral\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
- free( matched_dn );
+ ber_bvarray_free( refs );
+ bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+ p = NULL;
goto done;
}
- /* free parent and writer lock */
- bdb_entry_return( be, p );
+#ifdef BDB_SUBENTRIES
+ if ( subentry ) {
+ /* FIXME: */
+ /* parent must be an administrative point of the required kind */
+ }
+#endif
+
+ /* free parent and reader lock */
+ bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
p = NULL;
} else {
/*
* no parent!
- * must be adding entry to at suffix
- * or with parent ""
+ * must be adding entry at suffix or with parent ""
*/
- if ( !be_isroot( be, op->o_ndn )) {
- if ( be_issuffix( be, "" ) || be_isupdate( be, op->o_ndn ) ) {
-
+ 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;
/* check parent for "children" acl */
rc = access_allowed( be, conn, op, p,
- children, NULL, ACL_WRITE );
+ children, NULL, ACL_WRITE, NULL );
+
p = NULL;
+ switch( opinfo.boi_err ) {
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto retry;
+ }
+
if ( ! rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: no write access to parent\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_add: no write access to parent\n",
0, 0, 0 );
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
text = "no write access to parent";
goto return_results;;
}
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_add: %s denied\n",
+ pdn.bv_len == 0 ? "suffix" : "entry at root", 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: %s denied\n",
- pdn == NULL ? "suffix" : "entry at root",
+ pdn.bv_len == 0 ? "suffix" : "entry at root",
0, 0 );
+#endif
rc = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
}
+
+#ifdef BDB_SUBENTRIES
+ if( subentry ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: no parent, cannot add subentry\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_add: no parent, cannot add subentry\n",
+ 0, 0, 0 );
+#endif
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ text = "no parent, cannot add subentry";
+ goto return_results;;
+ }
+#endif
+#if 0
+ if ( ltid ) {
+ DBT obj;
+ obj.data = ",";
+ obj.size = 1;
+ rc = LOCK_GET( bdb->bi_dbenv, lockid, 0, &obj,
+ DB_LOCK_WRITE, &lock);
+ }
+#endif
+ }
+
+ rc = access_allowed( be, conn, op, e,
+ entry, NULL, ACL_WRITE, NULL );
+
+ switch( opinfo.boi_err ) {
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto retry;
+ }
+
+ if ( ! rc ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_add: no write access to entry\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE, "bdb_add: no write access to entry\n",
+ 0, 0, 0 );
+#endif
+ rc = LDAP_INSUFFICIENT_ACCESS;
+ text = "no write access to entry";
+ goto return_results;;
}
/* dn2id index */
- rc = bdb_dn2id_add( be, ltid, pdn, e );
+ rc = bdb_dn2id_add( be, ltid, &pdn, e );
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: dn2id_add failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: dn2id_add failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
+#endif
switch( rc ) {
case DB_LOCK_DEADLOCK:
/* id2entry index */
rc = bdb_id2entry_add( be, ltid, e );
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR, "bdb_add: id2entry_add failed\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: id2entry_add failed\n",
0, 0, 0 );
+#endif
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
/* attribute indexes */
rc = bdb_index_entry_add( be, ltid, e, e->e_attrs );
if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: index_entry_add failed\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_add: index_entry_add failed\n",
0, 0, 0 );
+#endif
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto return_results;
}
- if( bdb->bi_txn ) {
- rc = txn_commit( ltid, 0 );
+
+ if( op->o_noop ) {
+ if (( rc=TXN_ABORT( ltid )) != 0 ) {
+ text = "txn_abort (no-op) failed";
+ } else {
+ noop = 1;
+ rc = LDAP_SUCCESS;
+ }
+
+ } else {
+ char gid[DB_XIDDATASIZE];
+
+ snprintf( gid, sizeof( gid ), "%s-%08lx-%08lx",
+ bdb_uuid.bv_val, (long) op->o_connid, (long) op->o_opid );
+
+ if (( rc=TXN_PREPARE( ltid, gid )) != 0 ) {
+ text = "txn_prepare failed";
+
+ } else {
+ int ret = bdb_cache_add_entry_rw(bdb->bi_dbenv,
+ &bdb->bi_cache, e, CACHE_WRITE_LOCK,
+ locker, &lock);
+#if 0
+ if ( bdb_cache_add_entry_rw(&bdb->bi_cache,
+ e, CACHE_WRITE_LOCK) != 0 )
+#endif
+ switch ( ret ) {
+ case 0:
+ break;
+ case DB_LOCK_DEADLOCK:
+ case DB_LOCK_NOTGRANTED:
+ goto retry;
+ default:
+ ret = LDAP_OTHER;
+ }
+
+ if ( ret ) {
+ if(( rc=TXN_ABORT( ltid )) != 0 ) {
+ text = "cache add & txn_abort failed";
+ } else {
+ rc = LDAP_OTHER;
+ text = "cache add failed";
+ }
+ } else {
+ if(( rc=TXN_COMMIT( ltid, 0 )) != 0 ) {
+ text = "txn_commit failed";
+ } else {
+ rc = LDAP_SUCCESS;
+ }
+ }
+ }
}
+
ltid = NULL;
op->o_private = NULL;
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_add: txn_commit failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- rc = LDAP_OTHER;
- text = "commit failed";
-
- } else {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_add: added id=%08lx dn=\"%s\"\n",
- e->e_id, e->e_dn, 0 );
- rc = LDAP_SUCCESS;
+ if (rc == LDAP_SUCCESS) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, RESULTS,
+ "bdb_add: added%s id=%08lx dn=\"%s\"\n",
+ op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+#else
+ Debug(LDAP_DEBUG_TRACE, "bdb_add: added%s id=%08lx dn=\"%s\"\n",
+ op->o_noop ? " (no-op)" : "", e->e_id, e->e_dn );
+#endif
text = NULL;
+ if ( !noop ) {
+ bdb_cache_entry_commit( e );
+ }
+ }
+ else {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_add: %s : %s (%d)\n", text, db_strerror(rc), rc );
+#else
+ Debug( LDAP_DEBUG_TRACE, "bdb_add: %s : %s (%d)\n",
+ text, db_strerror(rc), rc );
+#endif
+ rc = LDAP_OTHER;
}
return_results:
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+ if ( rc == LDAP_SUCCESS && !noop ) {
+ LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
+ bdb_psearch( be, conn, op, ps_list, e, LDAP_PSEARCH_BY_ADD );
+ }
+ }
+#endif /* LDAP_CLIENT_UPDATE */
+
if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
TXN_CHECKPOINT( bdb->bi_dbenv,
}
done:
- if( pdn != NULL ) {
- free(pdn);
- }
-
- if (p != NULL) {
- /* free parent and writer lock */
- bdb_entry_return( be, p );
- }
if( ltid != NULL ) {
- txn_abort( ltid );
+ TXN_ABORT( ltid );
op->o_private = NULL;
}
- return rc;
+ return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
}
+
projects / openldap / blobdiff