Attribute *save_attrs;
Attribute *ap;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "bdb_modify_internal: 0x%08lx: %s\n",
+ e->e_id, e->e_dn, 0 );
+#else
Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
e->e_id, e->e_dn, 0);
+#endif
if ( !acl_check_modlist( be, conn, op, e, modlist )) {
return LDAP_INSUFFICIENT_ACCESS;
switch ( mod->sm_op ) {
case LDAP_MOD_ADD:
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify_internal: add\n", 0,0,0);
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
+#endif
err = modify_add_values( e, mod, text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: %d %s\n", err, *text, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
break;
case LDAP_MOD_DELETE:
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify_internal: delete\n", 0, 0, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
+#endif
err = modify_delete_values( e, mod, text, textbuf, textlen );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: %d %s\n", err, *text, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
break;
case LDAP_MOD_REPLACE:
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify_internal: replace\n", 0, 0, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
+#endif
err = modify_replace_values( e, mod, text, textbuf, textlen );
- assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: %d %s\n", err, *text, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
break;
case SLAP_MOD_SOFTADD:
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify_internal: softadd\n",0,0,0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: softadd\n", 0, 0, 0);
+#endif
/* Avoid problems in index_add_mods()
* We need to add index if necessary.
*/
}
if( err != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: %d %s\n", err, *text, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
break;
default:
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: invalid op %d\n", mod->sm_op, 0, 0 );
+#else
Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
+#endif
*text = "Invalid modify operation";
err = LDAP_OTHER;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: %d %s\n", err, *text, 0 );
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
if ( err != LDAP_SUCCESS ) {
e->e_ocflags = 0;
}
- /* check if modified attribute was indexed */
+ /* check if modified attribute was indexed
+ * but not in case of NOOP... */
err = bdb_index_is_indexed( be, mod->sm_desc );
- if ( err == LDAP_SUCCESS ) {
+ if ( err == LDAP_SUCCESS && !op->o_noop ) {
ap = attr_find( save_attrs, mod->sm_desc );
if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
/* check that the entry still obeys the schema */
rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
- if ( rc != LDAP_SUCCESS ) {
+ if ( rc != LDAP_SUCCESS || op->o_noop ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
- Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
- *text, 0, 0 );
+
+ if ( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR, "bdb_modify_internal: "
+ "entry failed schema check %s\n",
+ *text, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "entry failed schema check: %s\n",
+ *text, 0, 0 );
+#endif
+ }
+
+ /* if NOOP then silently revert to saved attrs */
return rc;
}
if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: attribute index delete failure\n",
+ 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Attribute index delete failure",
0, 0, 0 );
+#endif
return rc;
}
ap->a_flags &= ~SLAP_ATTR_IXDEL;
if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: attribute index add failure\n",
+ 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_ANY,
"Attribute index add failure",
0, 0, 0 );
+#endif
return rc;
}
ap->a_flags &= ~SLAP_ATTR_IXADD;
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int rc;
- Entry *matched;
- Entry *e;
+ Entry *matched = NULL;
+ Entry *e = NULL;
int manageDSAit = get_manageDSAit( op );
const char *text = NULL;
char textbuf[SLAP_TEXT_BUFLEN];
DB_TXN *ltid = NULL;
struct bdb_op_info opinfo;
+ u_int32_t locker;
+ DB_LOCK lock;
+
+ int noop = 0;
+
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ENTRY, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
+#else
Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
+#endif
if( 0 ) {
retry: /* transaction retry */
+ if( e != NULL ) {
+ bdb_cache_delete_entry(&bdb->bi_cache, e);
+ bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
+#else
Debug(LDAP_DEBUG_TRACE,
"bdb_modify: retrying...\n", 0, 0, 0);
- rc = txn_abort( ltid );
+#endif
+ rc = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
if( rc != 0 ) {
ldap_pvt_thread_yield();
}
- if( bdb->bi_txn ) {
- /* begin transaction */
- rc = txn_begin( bdb->bi_dbenv, NULL, <id,
- bdb->bi_db_opflags );
- text = NULL;
- if( rc != 0 ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modify: txn_begin failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
- rc = LDAP_OTHER;
- text = "internal error";
- goto return_results;
- }
+ /* begin transaction */
+ rc = TXN_BEGIN( bdb->bi_dbenv, NULL, <id,
+ bdb->bi_db_opflags );
+ text = NULL;
+ if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_modify: 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 );
+
opinfo.boi_bdb = be;
opinfo.boi_txn = ltid;
opinfo.boi_err = 0;
op->o_private = &opinfo;
/* get entry */
- rc = bdb_dn2entry( be, ltid, ndn, &e, &matched, 0 );
+ rc = bdb_dn2entry_w( be, ltid, ndn, &e, &matched, 0, locker, &lock );
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify: dn2entry failed: (%d)\n", rc, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: dn2entry failed (%d)\n",
rc, 0, 0 );
+#endif
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
goto retry;
case DB_NOTFOUND:
break;
+ case LDAP_BUSY:
+ text = "ldap server busy";
+ goto return_results;
default:
rc = LDAP_OTHER;
}
refs = is_entry_referral( matched )
? 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 {
ber_bvarray_free( refs );
free( matched_dn );
- return rc;
+ goto done;
}
if ( !manageDSAit && is_entry_referral( e ) ) {
- /* parent is a referral, don't allow add */
- /* parent is an alias, don't allow add */
+ /* entry is a referral, don't allow modify */
BerVarray refs = get_entry_referrals( be,
conn, op, e );
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: entry is referral\n",
0, 0, 0 );
+#endif
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
&text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify: modify failed (%d)\n", rc, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: modify failed (%d)\n",
rc, 0, 0 );
+#endif
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
/* change the entry itself */
rc = bdb_id2entry_update( be, ltid, e );
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify: id2entry update failed (%d)\n", rc, 0, 0 );
+#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: id2entry update failed (%d)\n",
rc, 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 {
+ rc = TXN_COMMIT( ltid, 0 );
}
ltid = NULL;
op->o_private = NULL;
if( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify: txn_%s failed %s (%d)\n",
+ op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc );
+#else
Debug( LDAP_DEBUG_TRACE,
- "bdb_modify: txn_commit failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
+ "bdb_modify: txn_%s failed: %s (%d)\n",
+ op->o_noop ? "abort (no-op)" : "commit",
+ db_strerror(rc), rc );
+#endif
rc = LDAP_OTHER;
text = "commit failed";
} else {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify: updated%s id=%08lx dn=\"%s\"\n",
+ op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn );
+#else
Debug( LDAP_DEBUG_TRACE,
- "bdb_modify: updated id=%08lx dn=\"%s\"\n",
- e->e_id, e->e_dn, 0 );
+ "bdb_modify: updated%s id=%08lx dn=\"%s\"\n",
+ op->o_noop ? " (no-op)" : "",
+ e->e_id, e->e_dn );
+#endif
rc = LDAP_SUCCESS;
text = NULL;
}
done:
if( ltid != NULL ) {
- txn_abort( ltid );
+ TXN_ABORT( ltid );
op->o_private = NULL;
}
if( e != NULL ) {
- bdb_entry_return( be, e );
+ bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
}
- return rc;
+ return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
}
-
projects / openldap / blobdiff