X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fmodify.c;h=d3fde84883d9ce42989e7bfaad5f27228c80a9c2;hb=b7f0983efafb6139d45814978ec376f87c228c37;hp=66df842a08a2cf8ebd0dbfdfa8fb2c96e8ded43f;hpb=c043a9c0cf3643bd55852609b0bb00b5f5e7fbad;p=openldap diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c index 66df842a08..d3fde84883 100644 --- a/servers/slapd/back-bdb/modify.c +++ b/servers/slapd/back-bdb/modify.c @@ -14,10 +14,6 @@ #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, @@ -35,8 +31,12 @@ int bdb_modify_internal( 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; @@ -50,64 +50,99 @@ int bdb_modify_internal( 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 ) { @@ -138,8 +173,12 @@ int bdb_modify_internal( 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; } @@ -153,9 +192,13 @@ int bdb_modify_internal( 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; @@ -170,9 +213,13 @@ int bdb_modify_internal( 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; @@ -203,13 +250,25 @@ bdb_modify( DB_TXN *ltid = NULL; struct bdb_op_info opinfo; +#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 ) { @@ -220,19 +279,21 @@ retry: /* transaction retry */ 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; @@ -241,12 +302,16 @@ retry: /* transaction retry */ 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: @@ -270,7 +335,7 @@ retry: /* transaction retry */ 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 { @@ -288,14 +353,17 @@ retry: /* transaction retry */ } 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 (( "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 ); @@ -309,9 +377,13 @@ retry: /* transaction retry */ &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: @@ -323,9 +395,13 @@ retry: /* transaction retry */ /* 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: @@ -335,23 +411,35 @@ retry: /* transaction retry */ 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; } @@ -368,227 +456,12 @@ return_results: 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, j; - 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( 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++ ) { - /* 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; - - rc = value_normalize( mod->sm_desc, - SLAP_MR_EQUALITY, - &mod->sm_bvalues[i], - &asserted, - &text ); - - if( rc != LDAP_SUCCESS ) return rc; - - 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, - &mod->sm_bvalues[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 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].bv_val != 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].bv_val != 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 */ - free( a->a_vals[j].bv_val ); - for ( k = j + 1; a->a_vals[k].bv_val != NULL; k++ ) { - a->a_vals[k - 1] = a->a_vals[k]; - } - a->a_vals[k - 1].bv_val = NULL; - a->a_vals[k - 1].bv_len = 0; - - 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].bv_val == 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 -) -{ - (void) attr_delete( &e->e_attrs, mod->sm_desc ); - - if ( mod->sm_bvalues ) { - return add_values( e, mod, dn ); - } - - return LDAP_SUCCESS; -}