Attribute *ap;
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY,"bdb_modify_internal: 0x%08lx: %s\n", e->e_id, e->e_dn ));
+ 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);
switch ( mod->sm_op ) {
case LDAP_MOD_ADD:
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: add\n" ));
+ 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 (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+ 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);
case LDAP_MOD_DELETE:
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: delete\n" ));
+ 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
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+ 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);
case LDAP_MOD_REPLACE:
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: replace\n" ));
+ 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 );
if( err != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+ 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);
case SLAP_MOD_SOFTADD:
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: softadd\n" ));
+ 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
if( err != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+ 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);
default:
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: invalid op %d\n", mod->sm_op ));
+ 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);
*text = "Invalid modify operation";
err = LDAP_OTHER;
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+ 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);
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;
+
+ if ( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: entry failed schema check %s\n", *text ));
+ 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 );
+ Debug( LDAP_DEBUG_ANY,
+ "entry failed schema check: %s\n",
+ *text, 0, 0 );
#endif
+ }
+
+ /* if NOOP then silently revert to saved attrs */
return rc;
}
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index delete failure\n" ));
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: attribute index delete failure\n",
+ 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index delete failure",
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: attribute index add failure\n" ));
+ LDAP_LOG ( OPERATION, ERR,
+ "bdb_modify_internal: attribute index add failure\n",
+ 0, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"Attribute index add failure",
u_int32_t locker;
DB_LOCK lock;
+ int noop = 0;
+
+#ifdef LDAP_CLIENT_UPDATE
+ Operation* ps_list;
+ struct psid_entry* pm_list;
+ struct psid_entry* pm_prev;
+#endif
+
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "bdb_modify: %s\n", dn->bv_val ));
+ 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
bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
}
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: retrying...\n" ));
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
#else
Debug(LDAP_DEBUG_TRACE,
"bdb_modify: retrying...\n", 0, 0, 0);
#endif
+
+#ifdef LDAP_CLIENT_UPDATE
+ pm_list = LDAP_LIST_FIRST(&op->premodify_list);
+ while ( pm_list != NULL ) {
+ LDAP_LIST_REMOVE ( pm_list, link );
+ pm_prev = pm_list;
+ pm_list = LDAP_LIST_NEXT ( pm_list, link );
+ free (pm_prev);
+ }
+#endif
+
rc = TXN_ABORT( ltid );
ltid = NULL;
op->o_private = NULL;
text = NULL;
if( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+ 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",
if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: dn2entry failed: (%d)\n", rc ));
+ LDAP_LOG ( OPERATION, DETAIL1,
+ "bdb_modify: dn2entry failed: (%d)\n", rc, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: dn2entry failed (%d)\n",
ber_bvarray_free( refs );
free( matched_dn );
- return rc;
+ goto done;
}
if ( !manageDSAit && is_entry_referral( e ) ) {
conn, op, e );
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: entry is referral\n" ));
+ LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: entry is referral\n", 0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
"bdb_modify: entry is referral\n",
ber_bvarray_free( refs );
goto done;
}
+
+#ifdef LDAP_CLIENT_UPDATE
+ if ( rc == LDAP_SUCCESS && !op->o_noop ) {
+ LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
+ bdb_psearch(be, conn, op, ps_list, e, LCUP_PSEARCH_BY_PREMODIFY );
+ }
+ }
+#endif /* LDAP_CLIENT_UPDATE */
/* Modify the entry */
rc = bdb_modify_internal( be, conn, op, ltid, modlist, e,
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: modify failed (%d)\n", rc ));
+ 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 = bdb_id2entry_update( be, ltid, e );
if ( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: id2entry update failed (%d)\n", rc ));
+ 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",
}
if( op->o_noop ) {
- rc = TXN_ABORT( ltid );
+ if ( ( rc = TXN_ABORT( ltid ) ) != 0 ) {
+ text = "txn_abort (no-op) failed";
+ } else {
+ noop = 1;
+ rc = LDAP_SUCCESS;
+ }
} else {
rc = TXN_COMMIT( ltid, 0 );
}
if( rc != 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: txn_%s failed %s (%d)\n", op->o_noop ? "abort (no_op)" : "commit", db_strerror(rc), rc ));
+ 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_%s failed: %s (%d)\n",
} else {
#ifdef NEW_LOGGING
- LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: updated%s id=%08lx dn=\"%s\"\n", op->o_noop ? " (no_op)" : "", e->e_id, e->e_dn ));
+ 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%s id=%08lx dn=\"%s\"\n",
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
+#ifdef LDAP_CLIENT_UPDATE
+ if ( rc == LDAP_SUCCESS && !op->o_noop ) {
+ /* Loop through in-scope entries for each psearch spec */
+ LDAP_LIST_FOREACH ( ps_list, &bdb->psearch_list, link ) {
+ bdb_psearch( be, conn, op, ps_list, e, LCUP_PSEARCH_BY_MODIFY );
+ }
+ pm_list = LDAP_LIST_FIRST(&op->premodify_list);
+ while ( pm_list != NULL ) {
+ bdb_psearch(be, conn, op, pm_list->ps->op,
+ e, LCUP_PSEARCH_BY_SCOPEOUT);
+ LDAP_LIST_REMOVE ( pm_list, link );
+ pm_prev = pm_list;
+ pm_list = LDAP_LIST_NEXT ( pm_list, link );
+ free (pm_prev);
+ }
+ }
+#endif /* LDAP_CLIENT_UPDATE */
+
if( rc == LDAP_SUCCESS && bdb->bi_txn_cp ) {
ldap_pvt_thread_yield();
TXN_CHECKPOINT( bdb->bi_dbenv,
done:
if( ltid != NULL ) {
+#ifdef LDAP_CLIENT_UPDATE
+ pm_list = LDAP_LIST_FIRST(&op->premodify_list);
+ while ( pm_list != NULL ) {
+ LDAP_LIST_REMOVE ( pm_list, link );
+ pm_prev = pm_list;
+ pm_list = LDAP_LIST_NEXT ( pm_list, link );
+ free (pm_prev);
+ }
+#endif
TXN_ABORT( ltid );
op->o_private = NULL;
}
if( e != NULL ) {
bdb_unlocked_cache_return_entry_w (&bdb->bi_cache, e);
}
- return rc;
+ return ( ( rc == LDAP_SUCCESS ) ? noop : rc );
}