/* modify.c - bdb backend modify 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
*/
#include "back-bdb.h"
#include "external.h"
-static int add_values( Entry *e, Modification *mod, char *dn );
-static int delete_values( Entry *e, Modification *mod, char *dn );
-static int replace_values( Entry *e, Modification *mod, char *dn );
-
int bdb_modify_internal(
BackendDB *be,
Connection *conn,
Modification *mod;
Modifications *ml;
Attribute *save_attrs;
+ Attribute *ap;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY,"bdb_modify_internal: 0x%08lx: %s\n", e->e_id, e->e_dn ));
+#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 (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: add\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: add\n", 0, 0, 0);
- err = add_values( e, mod, op->o_ndn.bv_val );
-
+#endif
+ err = modify_add_values( e, mod, text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
- *text = "modify: add values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#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 (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: delete\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: delete\n", 0, 0, 0);
- err = delete_values( e, mod, op->o_ndn.bv_val );
+#endif
+ err = modify_delete_values( e, mod, text, textbuf, textlen );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
- *text = "modify: delete values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#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 (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: replace\n" ));
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: replace\n", 0, 0, 0);
- err = replace_values( e, mod, op->o_ndn.bv_val );
+#endif
+ err = modify_replace_values( e, mod, text, textbuf, textlen );
assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
if( err != LDAP_SUCCESS ) {
- *text = "modify: replace values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#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 (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify_internal: softadd\n" ));
+#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.
*/
mod->sm_op = LDAP_MOD_ADD;
- err = add_values( e, mod, op->o_ndn.bv_val );
+ err = modify_add_values( e, mod, text, textbuf, textlen );
if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
err = LDAP_SUCCESS;
}
if( err != LDAP_SUCCESS ) {
- *text = "modify: (soft)add values failed";
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
break;
default:
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: invalid op %d\n", mod->sm_op ));
+#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 (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: %d %s\n", err, *text ));
+#else
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
+#endif
}
if ( err != LDAP_SUCCESS ) {
/* unlock entry, delete from cache */
return err;
}
+
+ /* If objectClass was modified, reset the flags */
+ if ( mod->sm_desc == slap_schema.si_ad_objectClass ) {
+ e->e_ocflags = 0;
+ }
+
+ /* check if modified attribute was indexed */
+ err = bdb_index_is_indexed( be, mod->sm_desc );
+ if ( err == LDAP_SUCCESS ) {
+ ap = attr_find( save_attrs, mod->sm_desc );
+ if ( ap ) ap->a_flags |= SLAP_ATTR_IXDEL;
+
+ ap = attr_find( e->e_attrs, mod->sm_desc );
+ if ( ap ) ap->a_flags |= SLAP_ATTR_IXADD;
+ }
}
/* check that the entry still obeys the schema */
- rc = entry_schema_check( e, save_attrs, text, textbuf, textlen );
+ rc = entry_schema_check( be, e, save_attrs, text, textbuf, textlen );
if ( rc != LDAP_SUCCESS ) {
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify_internal: entry failed schema check %s\n", *text ));
+#else
Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
*text, 0, 0 );
+#endif
return rc;
}
- /* delete indices for old attributes */
- rc = bdb_index_entry_del( be, tid, e, save_attrs);
- if ( rc != LDAP_SUCCESS ) {
- attrs_free( e->e_attrs );
- e->e_attrs = save_attrs;
- Debug( LDAP_DEBUG_ANY, "entry index delete failed!\n",
- 0, 0, 0 );
- return rc;
+ /* update the indices of the modified attributes */
+
+ /* start with deleting the old index entries */
+ for ( ap = save_attrs; ap != NULL; ap = ap->a_next ) {
+ if ( ap->a_flags & SLAP_ATTR_IXDEL ) {
+ rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
+ e->e_id, SLAP_INDEX_DELETE_OP );
+ if ( rc != LDAP_SUCCESS ) {
+ 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" ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "Attribute index delete failure",
+ 0, 0, 0 );
+#endif
+ return rc;
+ }
+ ap->a_flags &= ~SLAP_ATTR_IXDEL;
+ }
}
- /* add indices for new attributes */
- rc = bdb_index_entry_add( be, tid, e, e->e_attrs);
- if ( rc != LDAP_SUCCESS ) {
- attrs_free( e->e_attrs );
- e->e_attrs = save_attrs;
- Debug( LDAP_DEBUG_ANY, "entry index add failed!\n",
- 0, 0, 0 );
- return rc;
+ /* add the new index entries */
+ for ( ap = e->e_attrs; ap != NULL; ap = ap->a_next ) {
+ if (ap->a_flags & SLAP_ATTR_IXADD) {
+ rc = bdb_index_values( be, tid, ap->a_desc, ap->a_vals,
+ e->e_id, SLAP_INDEX_ADD_OP );
+ if ( rc != LDAP_SUCCESS ) {
+ 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" ));
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "Attribute index add failure",
+ 0, 0, 0 );
+#endif
+ return rc;
+ }
+ ap->a_flags &= ~SLAP_ATTR_IXADD;
+ }
}
return rc;
DB_TXN *ltid = NULL;
struct bdb_op_info opinfo;
- Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn, 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ENTRY, "bdb_modify: %s\n", dn->bv_val ));
+#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_cache_return_entry_w(&bdb->bi_cache, e);
+ }
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: retrying...\n" ));
+#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 ) {
text = "internal error";
goto return_results;
}
+ 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 (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: txn_begin failed: %s (%d)\n", db_strerror(rc), rc ));
+#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;
}
opinfo.boi_bdb = be;
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 );
if ( rc != 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: dn2entry failed: (%d)\n", rc ));
+#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:
/* acquire and lock entry */
if ( e == 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 )
: NULL;
- bdb_entry_return( be, matched );
+ bdb_cache_return_entry_r (&bdb->bi_cache, matched);
matched = NULL;
} else {
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
free( matched_dn );
return rc;
}
if ( !manageDSAit && is_entry_referral( e ) ) {
- /* parent is a referral, don't allow add */
- /* parent is an alias, don't allow add */
- struct berval **refs = get_entry_referrals( be,
+ /* entry is a referral, don't allow modify */
+ BerVarray refs = get_entry_referrals( be,
conn, op, e );
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_DETAIL1, "bdb_modify: entry is referral\n" ));
+#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 );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
goto done;
}
&text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG (( "modify", LDAP_LEVEL_ERR, "bdb_modify: modify failed (%d)\n", rc ));
+#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 (( "modify", LDAP_LEVEL_ERR, "bdb_modify: id2entry update failed (%d)\n", rc ));
+#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 ) {
+ rc = TXN_ABORT( ltid );
+ } else {
+ rc = TXN_COMMIT( ltid, 0 );
}
ltid = NULL;
op->o_private = NULL;
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 ));
+#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 (( "modify", LDAP_LEVEL_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_cache_return_entry_w (&bdb->bi_cache, e);
}
return rc;
}
-
-static int
-add_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i;
- Attribute *a;
-
- /* char *desc = mod->sm_desc->ad_cname.bv_val; */
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- a = attr_find( e->e_attrs, mod->sm_desc );
-
- /* check if the values we're adding already exist */
- if ( a != NULL ) {
- if( mr == NULL || !mr->smr_match ) {
- /* do not allow add of additional attribute
- if no equality rule exists */
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
- for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
- int rc;
- int j;
- const char *text = NULL;
- struct berval asserted;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- for ( j = 0; a->a_vals[j] != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match == 0 ) {
- free( asserted.bv_val );
- return LDAP_TYPE_OR_VALUE_EXISTS;
- }
- }
-
- free( asserted.bv_val );
- }
- }
-
- /* no - add them */
- if( attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 ) {
- /* this should return result return of attr_merge */
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-delete_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int i, j, k, found;
- Attribute *a;
- char *desc = mod->sm_desc->ad_cname.bv_val;
- MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
-
- /* delete the entire attribute */
- if ( mod->sm_bvalues == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modify_delete: removing entire attribute %s\n",
- desc, 0, 0 );
- return attr_delete( &e->e_attrs, mod->sm_desc )
- ? LDAP_NO_SUCH_ATTRIBUTE : LDAP_SUCCESS;
- }
-
- if( mr == NULL || !mr->smr_match ) {
- /* disallow specific attributes from being deleted if
- no equality rule */
- return LDAP_INAPPROPRIATE_MATCHING;
- }
-
- /* delete specific values - find the attribute first */
- if ( (a = attr_find( e->e_attrs, mod->sm_desc )) == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modify_delete: could not find attribute %s\n",
- desc, 0, 0 );
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
-
- /* find each value to delete */
- for ( i = 0; mod->sm_bvalues[i] != NULL; i++ ) {
- int rc;
- const char *text = NULL;
-
- struct berval asserted;
-
- rc = value_normalize( mod->sm_desc,
- SLAP_MR_EQUALITY,
- mod->sm_bvalues[i],
- &asserted,
- &text );
-
- if( rc != LDAP_SUCCESS ) return rc;
-
- found = 0;
- for ( j = 0; a->a_vals[j] != NULL; j++ ) {
- int match;
- int rc = value_match( &match, mod->sm_desc, mr,
- SLAP_MR_VALUE_SYNTAX_MATCH,
- a->a_vals[j], &asserted, &text );
-
- if( rc == LDAP_SUCCESS && match != 0 ) {
- continue;
- }
-
- /* found a matching value */
- found = 1;
-
- /* delete it */
- ber_bvfree( a->a_vals[j] );
- for ( k = j + 1; a->a_vals[k] != NULL; k++ ) {
- a->a_vals[k - 1] = a->a_vals[k];
- }
- a->a_vals[k - 1] = NULL;
-
- break;
- }
-
- free( asserted.bv_val );
-
- /* looked through them all w/o finding it */
- if ( ! found ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modify_delete: could not find value for attr %s\n",
- desc, 0, 0 );
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
-
- /* if no values remain, delete the entire attribute */
- if ( a->a_vals[0] == NULL ) {
- Debug( LDAP_DEBUG_TRACE,
- "bdb_modify_delete: removing entire attribute %s\n",
- desc, 0, 0 );
- if ( attr_delete( &e->e_attrs, mod->sm_desc ) ) {
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
-
- return LDAP_SUCCESS;
-}
-
-static int
-replace_values(
- Entry *e,
- Modification *mod,
- char *dn
-)
-{
- int rc = attr_delete( &e->e_attrs, mod->sm_desc );
-
- if( rc != LDAP_SUCCESS && rc != LDAP_NO_SUCH_ATTRIBUTE ) {
- return rc;
- }
-
- if ( mod->sm_bvalues != NULL &&
- attr_merge( e, mod->sm_desc, mod->sm_bvalues ) != 0 )
- {
- return LDAP_OTHER;
- }
-
- return LDAP_SUCCESS;
-}
projects / openldap / blobdiff