X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fgroup.c;h=d4fb4de09e0bdc23912ab7de3faaf56a2e21600c;hb=23efa07a994c94c4e78a9495ac6e2981b87b4ba0;hp=9bd50a3a10816f5a04fe9d309348a37619852928;hpb=fafce1601e5bcd0eca185a2a0366cd2b198121a6;p=openldap

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 9bd50a3a10..d4fb4de09e 100644
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -33,7 +33,9 @@ bdb_group(
 	AttributeDescription *group_at
 )
 {
-	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	rc = 1;
 	Attribute *attr;
@@ -42,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 {
@@ -49,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",
@@ -69,38 +74,66 @@ bdb_group(
 		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 ) {
+		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( 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",
@@ -114,21 +147,23 @@ bdb_group(
 	 */
 	rc = 1;
 
+#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 );
 #endif
 		goto return_results;
 	}
+#endif
 
 	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 );
@@ -136,11 +171,11 @@ bdb_group(
 		goto return_results;
 	}
 
-	if( !is_entry_objectclass( e, group_oc ) ) {
+	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", 
@@ -151,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",
@@ -162,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",
@@ -173,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", 
@@ -185,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", 
@@ -199,12 +233,15 @@ bdb_group(
 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_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