/* 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
*/
Modification *mod;
Modifications *ml;
Attribute *save_attrs;
+ Attribute *ap;
Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
e->e_id, e->e_dn, 0);
/* 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;
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;
+ Debug( LDAP_DEBUG_ANY,
+ "Attribute index delete failure",
+ 0, 0, 0 );
+ 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;
+ Debug( LDAP_DEBUG_ANY,
+ "Attribute index add failure",
+ 0, 0, 0 );
+ 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 );
+ Debug( LDAP_DEBUG_ARGS, "bdb_modify: %s\n", dn->bv_val, 0, 0 );
if( 0 ) {
retry: /* transaction retry */
text = "internal error";
goto return_results;
}
+ ldap_pvt_thread_yield();
}
if( bdb->bi_txn ) {
/* acquire and lock entry */
if ( e == NULL ) {
char* matched_dn = NULL;
- BVarray refs;
+ BerVarray refs;
if ( matched != NULL ) {
matched_dn = ch_strdup( matched->e_dn );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
matched_dn, NULL, refs, NULL );
- bvarray_free( 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 */
- BVarray refs = get_entry_referrals( be,
+ BerVarray refs = get_entry_referrals( be,
conn, op, e );
Debug( LDAP_DEBUG_TRACE,
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
e->e_dn, NULL, refs, NULL );
- bvarray_free( refs );
+ ber_bvarray_free( refs );
goto done;
}
char *dn
)
{
- int i;
+ int i, j;
Attribute *a;
/* char *desc = mod->sm_desc->ad_cname.bv_val; */
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 ) {
+ if( mr == NULL || !mr->smr_match ) {
+ if ( a != NULL ) {
/* do not allow add of additional attribute
if no equality rule exists */
return LDAP_INAPPROPRIATE_MATCHING;
}
for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
- int rc;
- int j;
+ /* test asserted values against existing values */
+ if( a ) {
+ for( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+ int rc = ber_bvcmp( &mod->sm_bvalues[i],
+ &a->a_vals[j] );
+
+ if( rc == 0 ) {
+ /* value exists already */
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+ }
+ }
+
+ /* test asserted values against themselves */
+ for( j = 0; j < i; j++ ) {
+ int rc = ber_bvcmp( &mod->sm_bvalues[i],
+ &mod->sm_bvalues[j] );
+
+ if( rc == 0 ) {
+ /* value exists already */
+ return LDAP_TYPE_OR_VALUE_EXISTS;
+ }
+ }
+ }
+
+ } else {
+ for ( i = 0; mod->sm_bvalues[i].bv_val != NULL; i++ ) {
+ int rc, match;
const char *text = NULL;
struct berval asserted;
if( rc != LDAP_SUCCESS ) return rc;
- for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
- int match;
+ if( a ) {
+ for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) {
+ 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;
+ }
+ }
+ }
+
+ for ( j = 0; j < i; j++ ) {
int rc = value_match( &match, mod->sm_desc, mr,
SLAP_MR_VALUE_SYNTAX_MATCH,
- &a->a_vals[j], &asserted, &text );
+ &mod->sm_bvalues[j], &asserted, &text );
if( rc == LDAP_SUCCESS && match == 0 ) {
free( asserted.bv_val );
char *dn
)
{
- int rc = attr_delete( &e->e_attrs, mod->sm_desc );
+ (void) 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;
+ if ( mod->sm_bvalues ) {
+ return add_values( e, mod, dn );
}
return LDAP_SUCCESS;
projects / openldap / blobdiff