NVALUES: fix a couple of value_find_ex() calls

[openldap] / servers / slapd / back-bdb / attribute.c

diff --git a/servers/slapd/back-bdb/attribute.c b/servers/slapd/back-bdb/attribute.c
index 6ad4b30e78d0a21f3d3eae9de98f2a231e59107a..f5cbdf7577a693ecd4900d8ec6fd8c3332e6c71b 100644 (file)
--- a/servers/slapd/back-bdb/attribute.c
+++ b/servers/slapd/back-bdb/attribute.c
@@ -1,7 +1,7 @@
 /* attribute.c - bdb backend acl attribute routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -39,38 +39,41 @@ bdb_attribute(
        const char *entry_at_name = entry_at->ad_cname.bv_val;
        AccessControlState acl_state = ACL_STATE_INIT;
 
-       u_int32_t       locker;
+       u_int32_t       locker = 0;
        DB_LOCK         lock;
+       int             free_lock_id = 0;
 
 #ifdef NEW_LOGGING
        LDAP_LOG( BACK_BDB, ARGS, 
-               "bdb_attribute: gr dn: \"%s\"\n", entry_ndn->bv_val, 0, 0 );
+               "bdb_attribute: gr ndn: \"%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",
+       LDAP_LOG( BACK_BDB, ARGS, "bdb_attribute: tr ndn: \"%s\"\n",
                target ? target->e_ndn : "", 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS,
-               "=> bdb_attribute: gr dn: \"%s\"\n",
+               "=> bdb_attribute: gr ndn: \"%s\"\n",
                entry_ndn->bv_val, 0, 0 ); 
        Debug( LDAP_DEBUG_ARGS,
                "=> bdb_attribute: at: \"%s\"\n", 
                entry_at_name, 0, 0 ); 
 
        Debug( LDAP_DEBUG_ARGS,
-               "=> bdb_attribute: tr dn: \"%s\"\n",
+               "=> bdb_attribute: tr ndn: \"%s\"\n",
                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;
+               locker = boi->boi_locker;
        }
 
        if ( txn != NULL ) {
                locker = TXN_ID ( txn );
-       } else {
+       } else if ( !locker ) {
                rc = LOCK_ID ( bdb->bi_dbenv, &locker );
+               free_lock_id = 1;
                switch(rc) {
                case 0:
                        break;
@@ -91,23 +94,26 @@ bdb_attribute(
                        entry_ndn->bv_val, 0, 0 );
 #endif
 
-
        } else {
 dn2entry_retry:
                /* can we find entry */
-               rc = bdb_dn2entry_r( be, NULL, entry_ndn, &e, NULL, 0, locker, &lock );
+               rc = bdb_dn2entry_r( be, txn, 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:
-                       if( txn != NULL ) {
+                       /* the txn must abort and retry */
+                       if ( txn ) {
                                boi->boi_err = rc;
+                               return LDAP_BUSY;
                        }
-                       else {
+                       ldap_pvt_thread_yield();
+                       goto dn2entry_retry;
+               default:
+                       boi->boi_err = rc;
+                       if ( free_lock_id ) {
                                LOCK_ID_FREE( bdb->bi_dbenv, locker );
                        }
                        return (rc != LDAP_BUSY) ? LDAP_OTHER : LDAP_BUSY;
@@ -122,7 +128,7 @@ dn2entry_retry:
                                "=> bdb_attribute: cannot find entry: \"%s\"\n",
                                        entry_ndn->bv_val, 0, 0 ); 
 #endif
-                       if ( txn == NULL ) {
+                       if ( free_lock_id ) {
                                LOCK_ID_FREE( bdb->bi_dbenv, locker );
                        }
                        return LDAP_NO_SUCH_OBJECT; 
@@ -165,14 +171,6 @@ dn2entry_retry:
                goto return_results;
        }
 
-       if (conn != NULL && op != NULL
-               && access_allowed( be, conn, op, e, slap_schema.si_ad_entry,
-                       NULL, ACL_READ, &acl_state ) == 0 )
-       {
-               rc = LDAP_INSUFFICIENT_ACCESS;
-               goto return_results;
-       }
-
        if ((attr = attr_find(e->e_attrs, entry_at)) == NULL) {
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_BDB, INFO, 
@@ -187,8 +185,8 @@ dn2entry_retry:
        }
 
        if (conn != NULL && op != NULL
-               && access_allowed( be, conn, op, e, entry_at, NULL, ACL_READ, 
-                          &acl_state ) == 0 )
+               && access_allowed( be, conn, op, e, entry_at, NULL,
+                       ACL_AUTH, &acl_state ) == 0 )
        {
                rc = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
@@ -204,7 +202,7 @@ dn2entry_retry:
                if( conn != NULL
                        && op != NULL
                        && access_allowed(be, conn, op, e, entry_at,
-                               &attr->a_vals[i], ACL_READ, &acl_state ) == 0)
+                               &attr->a_vals[i], ACL_AUTH, &acl_state ) == 0)
                {
                        continue;
                }
@@ -230,7 +228,7 @@ return_results:
                bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
        }
 
-       if ( txn == NULL ) {
+       if ( free_lock_id ) {
                LOCK_ID_FREE( bdb->bi_dbenv, locker );
        }