X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fattribute.c;h=8b7ec4b8e49a672c30865d701316a5de3b5e0f2f;hb=6e9c21cff8fc740dc6ed21c6f64d9a8899a33401;hp=96fdd1bf4af657ec996e7de01acf02676246b566;hpb=fafce1601e5bcd0eca185a2a0366cd2b198121a6;p=openldap diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c index 96fdd1bf4a..8b7ec4b8e4 100644 --- a/servers/slapd/back-bdb/attribute.c +++ b/servers/slapd/back-bdb/attribute.c @@ -16,7 +16,6 @@ #include "back-bdb.h" #include "proto-bdb.h" - /* return LDAP_SUCCESS IFF we can retrieve the attributes * of entry with e_ndn */ @@ -28,23 +27,28 @@ bdb_attribute( Entry *target, struct berval *entry_ndn, AttributeDescription *entry_at, - BVarray *vals ) + BerVarray *vals ) { - struct bdbinfo *li = (struct bdbinfo *) be->be_private; + struct bdb_info *bdb = (struct bdb_info *) be->be_private; + struct bdb_op_info *boi = NULL; + DB_TXN *txn = NULL; Entry *e; - int i, j, rc; + int i, j = 0, rc; Attribute *attr; - BVarray v; + BerVarray v; const char *entry_at_name = entry_at->ad_cname.bv_val; + AccessControlState acl_state = ACL_STATE_INIT; + + u_int32_t locker; + DB_LOCK lock; #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ARGS, - "bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val )); - LDAP_LOG(( "backend", LDAP_LEVEL_ARGS, - "bdb_attribute: at: \"%s\"\n", entry_at_name)); - LDAP_LOG(( "backend", LDAP_LEVEL_ARGS, - "bdb_attribute: tr dn: \"%s\"\n", - target ? target->e_ndn : "" )); + LDAP_LOG( BACK_BDB, ARGS, + "bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 ); + LDAP_LOG( BACK_BDB, ARGS, + "bdb_attribute: at: \"%s\"\n", entry_at_name, 0, 0); + LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr dn: \"%s\"\n", + target ? target->e_ndn : "", 0, 0 ); #else Debug( LDAP_DEBUG_ARGS, "=> bdb_attribute: gr dn: \"%s\"\n", @@ -58,47 +62,74 @@ bdb_attribute( target ? target->e_ndn : "", 0, 0 ); #endif + if( op ) boi = (struct bdb_op_info *) op->o_private; + if( boi != NULL && be == boi->boi_bdb ) { + txn = boi->boi_txn; + } + + if ( txn != NULL ) { + locker = TXN_ID ( txn ); + } else { + rc = LOCK_ID ( bdb->bi_dbenv, &locker ); + switch(rc) { + case 0: + break; + default: + return LDAP_OTHER; + } + } + if (target != NULL && dn_match(&target->e_nname, entry_ndn)) { /* we already have a LOCKED copy of the entry */ e = target; #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "bdb_attribute: target is LOCKED (%s)\n", - entry_ndn->bv_val )); + LDAP_LOG( BACK_BDB, DETAIL1, + "bdb_attribute: target is LOCKED (%s)\n", entry_ndn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_ARGS, "=> bdb_attribute: target is entry: \"%s\"\n", entry_ndn->bv_val, 0, 0 ); #endif - } else { +dn2entry_retry: /* can we find entry */ - rc = bdb_dn2entry( be, NULL, entry_ndn, &e, NULL, 0 ); + rc = bdb_dn2entry_r( be, NULL, entry_ndn, &e, NULL, 0, locker, &lock ); switch( rc ) { case DB_NOTFOUND: case 0: break; + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + goto dn2entry_retry; default: - return LDAP_OTHER; + if( txn != NULL ) { + boi->boi_err = rc; + } + else { + LOCK_ID_FREE( bdb->bi_dbenv, locker ); + } + return (rc != LDAP_BUSY) ? LDAP_OTHER : LDAP_BUSY; } if (e == NULL) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "bdb_attribute: cannot find entry (%s)\n", - entry_ndn->bv_val )); + LDAP_LOG( BACK_BDB, INFO, + "bdb_attribute: cannot find entry (%s)\n", + entry_ndn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_ACL, "=> bdb_attribute: cannot find entry: \"%s\"\n", entry_ndn->bv_val, 0, 0 ); #endif + if ( txn == NULL ) { + LOCK_ID_FREE( bdb->bi_dbenv, locker ); + } return LDAP_NO_SUCH_OBJECT; } #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1, - "bdb_attribute: found entry (%s)\n", - entry_ndn->bv_val )); + LDAP_LOG( BACK_BDB, DETAIL1, "bdb_attribute: found entry (%s)\n", + entry_ndn->bv_val, 0, 0 ); #else Debug( LDAP_DEBUG_ACL, "=> bdb_attribute: found entry: \"%s\"\n", @@ -106,11 +137,12 @@ bdb_attribute( #endif } +#ifdef BDB_ALIASES /* find attribute values */ if( is_entry_alias( e ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "bdb_attribute: entry (%s) is an alias\n", e->e_dn )); + LDAP_LOG( BACK_BDB, INFO, + "bdb_attribute: entry (%s) is an alias\n", e->e_dn, 0, 0 ); #else Debug( LDAP_DEBUG_ACL, "<= bdb_attribute: entry is an alias\n", 0, 0, 0 ); @@ -118,11 +150,12 @@ bdb_attribute( rc = LDAP_ALIAS_PROBLEM; goto return_results; } +#endif if( is_entry_referral( e ) ) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "bdb_attribute: entry (%s) is a referral.\n", e->e_dn )); + LDAP_LOG( BACK_BDB, INFO, + "bdb_attribute: entry (%s) is a referral.\n", e->e_dn, 0, 0); #else Debug( LDAP_DEBUG_ACL, "<= bdb_attribute: entry is a referral\n", 0, 0, 0 ); @@ -131,18 +164,10 @@ bdb_attribute( goto return_results; } - if (conn != NULL && op != NULL - && access_allowed(be, conn, op, e, slap_schema.si_ad_entry, - NULL, ACL_READ) == 0) - { - rc = LDAP_INSUFFICIENT_ACCESS; - goto return_results; - } - if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) { #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_INFO, - "bdb_attribute: failed to find %s.\n", entry_at_name )); + LDAP_LOG( BACK_BDB, INFO, + "bdb_attribute: failed to find %s.\n", entry_at_name, 0, 0 ); #else Debug( LDAP_DEBUG_ACL, "<= bdb_attribute: failed to find %s\n", @@ -153,7 +178,8 @@ bdb_attribute( } if (conn != NULL && op != NULL - && access_allowed(be, conn, op, e, entry_at, NULL, ACL_READ) == 0) + && access_allowed( be, conn, op, e, entry_at, NULL, + ACL_AUTH, &acl_state ) == 0 ) { rc = LDAP_INSUFFICIENT_ACCESS; goto return_results; @@ -163,13 +189,13 @@ bdb_attribute( /* count them */ } - v = (BVarray) ch_malloc( sizeof(struct berval) * (i+1) ); + v = (BerVarray) ch_malloc( sizeof(struct berval) * (i+1) ); for ( i=0, j=0; attr->a_vals[i].bv_val != NULL; i++ ) { if( conn != NULL && op != NULL && access_allowed(be, conn, op, e, entry_at, - &attr->a_vals[i], ACL_READ) == 0) + &attr->a_vals[i], ACL_AUTH, &acl_state ) == 0) { continue; } @@ -192,13 +218,15 @@ bdb_attribute( return_results: if( target != e ) { /* free entry */ - bdb_entry_return( be, e ); + bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock); + } + + if ( txn == NULL ) { + LOCK_ID_FREE( bdb->bi_dbenv, locker ); } #ifdef NEW_LOGGING - LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, - "bdb_attribute: rc=%d nvals=%d.\n", - rc, j )); + LDAP_LOG( BACK_BDB, ENTRY, "bdb_attribute: rc=%d nvals=%d.\n", rc, j, 0 ); #else Debug( LDAP_DEBUG_TRACE, "bdb_attribute: rc=%d nvals=%d\n",