use ldap_charray_*() instead of charray_*()

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

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 2000de520996c7f849c70efc136ce9ac9bd2c2b1..d4fb4de09e0bdc23912ab7de3faaf56a2e21600c 100644 (file)
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -44,6 +44,9 @@ bdb_group(
        const char *group_oc_name = NULL;
        const char *group_at_name = group_at->ad_cname.bv_val;
 
+       u_int32_t       locker;
+       DB_LOCK         lock;
+
        if( group_oc->soc_names && group_oc->soc_names[0] ) {
                group_oc_name = group_oc->soc_names[0];
        } else {
@@ -51,9 +54,9 @@ bdb_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( BACK_BDB, ENTRY, 
                "bdb_group: check (%s) member of (%s), oc %s\n",
-               op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
+               op_ndn->bv_val, gr_ndn->bv_val, group_oc_name );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "=> bdb_group: gr dn: \"%s\"\n",
@@ -76,41 +79,61 @@ bdb_group(
                txn = boi->boi_txn;
        }
 
+       if ( txn ) {
+               locker = TXN_ID( txn );
+       } else {
+               LOCK_ID ( bdb->bi_dbenv, &locker );
+               switch(rc) {
+               case 0:
+                       break;
+               default:
+                       return 1;
+               }
+       }
+
        if (dn_match(&target->e_name, gr_ndn)) {
                /* we already have a LOCKED copy of the entry */
                e = target;
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_group: target is group (%s)\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ARGS,
                        "=> bdb_group: target is group: \"%s\"\n",
                        gr_ndn->bv_val, 0, 0 );
 #endif
        } else {
+dn2entry_retry:
                /* can we find group entry */
-               rc = bdb_dn2entry_r( be, NULL, gr_ndn, &e, NULL, 0 ); 
+               rc = bdb_dn2entry_r( be, NULL, gr_ndn, &e, NULL, 0, locker, &lock ); 
                if( rc ) {
+                       if ( rc == DB_LOCK_DEADLOCK || rc == DB_LOCK_NOTGRANTED )
+                               goto dn2entry_retry;
                        if( txn ) {
                                boi->boi_err = rc;
                        }
+                       else {
+                               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+                       }
                        return( 1 );
                }
                if (e == NULL) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                               "bdb_group: cannot find group (%s)\n",
-                               gr_ndn->bv_val ));
+                       LDAP_LOG( BACK_BDB, DETAIL1, 
+                               "bdb_group: cannot find group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                        Debug( LDAP_DEBUG_ACL,
                                "=> bdb_group: cannot find group: \"%s\"\n",
                                        gr_ndn->bv_val, 0, 0 ); 
 #endif
+                       if ( txn == NULL ) {
+                               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+                       }
                        return( 1 );
                }
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                       "bdb_group: found group (%s)\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "=> bdb_group: found group: \"%s\"\n",
@@ -127,8 +150,8 @@ bdb_group(
 #ifdef BDB_ALIASES
        if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: group (%s) is an alias\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0);
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: group is an alias\n", 0, 0, 0 );
@@ -139,8 +162,8 @@ bdb_group(
 
        if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: group is a referral\n", 0, 0, 0 );
@@ -150,9 +173,9 @@ bdb_group(
 
        if( !is_entry_objectclass( e, group_oc, 0 ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                       "bdb_group: failed to find %s in objectClass.\n",
-                       group_oc_name ));
+               LDAP_LOG( BACK_BDB, ERR, 
+                       "bdb_group: failed to find %s in objectClass.\n", 
+                       group_oc_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: failed to find %s in objectClass\n", 
@@ -163,8 +186,8 @@ bdb_group(
 
        if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                       "bdb_group: failed to find %s\n", group_at_name ));
+               LDAP_LOG( BACK_BDB, INFO, 
+                       "bdb_group: failed to find %s\n", group_at_name, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: failed to find %s\n",
@@ -174,9 +197,9 @@ bdb_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( BACK_BDB, ENTRY, 
                "bdb_group: found objectClass %s and %s\n",
-               group_oc_name, group_at_name ));
+               group_oc_name, group_at_name, 0 );
 #else
        Debug( LDAP_DEBUG_ACL,
                "<= bdb_group: found objectClass %s and %s\n",
@@ -185,9 +208,9 @@ bdb_group(
 
        if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+               LDAP_LOG( BACK_BDB, DETAIL1, 
                        "bdb_group: \"%s\" not in \"%s\": %s\n",
-                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
+                       op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
                Debug( LDAP_DEBUG_ACL,
                        "<= bdb_group: \"%s\" not in \"%s\": %s\n", 
@@ -197,9 +220,8 @@ bdb_group(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-               "bdb_group: %s is in %s: %s\n",
-               op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
+       LDAP_LOG( BACK_BDB, DETAIL1, "bdb_group: %s is in %s: %s\n",
+               op_ndn->bv_val, gr_ndn->bv_val, group_at_name );
 #else
        Debug( LDAP_DEBUG_ACL,
                "<= bdb_group: \"%s\" is in \"%s\": %s\n", 
@@ -211,12 +233,15 @@ bdb_group(
 return_results:
        if( target != e ) {
                /* free entry */
-               bdb_cache_return_entry_r( &bdb->bi_cache, 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_group: rc=%d\n", rc ));
+       LDAP_LOG( BACK_BDB, ENTRY, "bdb_group: rc=%d\n", rc, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "bdb_group: rc=%d\n", rc, 0, 0 ); 
 #endif