X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fgroup.c;h=2000de520996c7f849c70efc136ce9ac9bd2c2b1;hb=02fb60d3dad11f9ee46feb6ba3eb9ad96dde0c48;hp=761bc0df9339d42cdab8ac33117a27dbe50e292a;hpb=0b037b55664c416d6ef07635f016eb1fa0f7223f;p=openldap

diff --git a/servers/slapd/back-bdb/group.c b/servers/slapd/back-bdb/group.c
index 761bc0df93..2000de5209 100644
--- a/servers/slapd/back-bdb/group.c
+++ b/servers/slapd/back-bdb/group.c
@@ -1,7 +1,7 @@
 /* group.c - bdb backend acl group routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -27,17 +27,18 @@ bdb_group(
 	Connection *conn,
 	Operation *op,
 	Entry	*target,
-	const char	*gr_ndn,
-	const char	*op_ndn,
+	struct berval	*gr_ndn,
+	struct berval	*op_ndn,
 	ObjectClass *group_oc,
 	AttributeDescription *group_at
 )
 {
-	struct bdbinfo *li = (struct bdbinfo *) be->be_private;    
-	Entry	     *e;
-	int	     rc = 1;
-	Attribute   *attr;
-	struct berval bv;
+	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;
 
 	AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
 	const char *group_oc_name = NULL;
@@ -51,16 +52,16 @@ bdb_group(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "bdb_group: check (%s) member of (%s), oc %s\n",
-		   op_ndn, gr_ndn, group_oc_name ));
+		"bdb_group: check (%s) member of (%s), oc %s\n",
+		op_ndn->bv_val, gr_ndn->bv_val, group_oc_name ));
 #else
 	Debug( LDAP_DEBUG_ARGS,
 		"=> bdb_group: gr dn: \"%s\"\n",
-		gr_ndn, 0, 0 ); 
+		gr_ndn->bv_val, 0, 0 ); 
 
 	Debug( LDAP_DEBUG_ARGS,
 		"=> bdb_group: op dn: \"%s\"\n",
-		op_ndn, 0, 0 ); 
+		op_ndn->bv_val, 0, 0 ); 
 	Debug( LDAP_DEBUG_ARGS,
 		"=> bdb_group: oc: \"%s\" at: \"%s\"\n", 
 		group_oc_name, group_at_name, 0 ); 
@@ -70,68 +71,76 @@ bdb_group(
 		target->e_ndn, 0, 0 ); 
 #endif
 
-	if (strcmp(target->e_ndn, gr_ndn) == 0) {
+	if( op ) boi = (struct bdb_op_info *) op->o_private;
+	if( boi != NULL && be == boi->boi_bdb ) {
+		txn = boi->boi_txn;
+	}
+
+	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 ));
+			"bdb_group: target is group (%s)\n", gr_ndn->bv_val ));
 #else
 		Debug( LDAP_DEBUG_ARGS,
 			"=> bdb_group: target is group: \"%s\"\n",
-			gr_ndn, 0, 0 );
+			gr_ndn->bv_val, 0, 0 );
 #endif
 	} else {
 		/* 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 ); 
 		if( rc ) {
+			if( txn ) {
+				boi->boi_err = rc;
+			}
 			return( 1 );
 		}
 		if (e == NULL) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-				   "bdb_group: cannot find group (%s)\n",
-				   gr_ndn ));
+				"bdb_group: cannot find group (%s)\n",
+				gr_ndn->bv_val ));
 #else
 			Debug( LDAP_DEBUG_ACL,
 				"=> bdb_group: cannot find group: \"%s\"\n",
-					gr_ndn, 0, 0 ); 
+					gr_ndn->bv_val, 0, 0 ); 
 #endif
 			return( 1 );
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			   "bdb_group: found group (%s)\n", gr_ndn ));
+			"bdb_group: found group (%s)\n", gr_ndn->bv_val ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"=> bdb_group: found group: \"%s\"\n",
-			gr_ndn, 0, 0 ); 
+			gr_ndn->bv_val, 0, 0 ); 
 #endif
-    }
+	}
 
 	/* find it's objectClass and member attribute values
 	 * make sure this is a group entry
 	 * finally test if we can find op_dn in the member attribute value list
 	 */
-	
 	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 ));
+			"bdb_group: group (%s) is an alias\n", gr_ndn->bv_val ));
 #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 ));
+			"bdb_group: group (%s) is a referral.\n", gr_ndn->bv_val ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= bdb_group: group is a referral\n", 0, 0, 0 );
@@ -139,11 +148,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 ));
+			"bdb_group: failed to find %s in objectClass.\n",
+			group_oc_name ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= bdb_group: failed to find %s in objectClass\n", 
@@ -155,7 +164,7 @@ 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 ));
+			"bdb_group: failed to find %s\n", group_at_name ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= bdb_group: failed to find %s\n",
@@ -166,38 +175,35 @@ bdb_group(
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "bdb_group: found objectClass %s and %s\n",
-		   group_oc_name, group_at_name ));
+		"bdb_group: found objectClass %s and %s\n",
+		group_oc_name, group_at_name ));
 #else
 	Debug( LDAP_DEBUG_ACL,
 		"<= bdb_group: found objectClass %s and %s\n",
 		group_oc_name, group_at_name, 0 ); 
 #endif
 
-	bv.bv_val = (char *) op_ndn;
-	bv.bv_len = strlen( op_ndn );	      
-
-	if( value_find( group_at, attr->a_vals, &bv ) != LDAP_SUCCESS ) {
+	if( value_find( group_at, attr->a_vals, op_ndn ) != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			   "bdb_group: \"%s\" not in \"%s\": %s\n",
-			   op_ndn, gr_ndn, group_at_name ));
+			"bdb_group: \"%s\" not in \"%s\": %s\n",
+			op_ndn->bv_val, gr_ndn->bv_val, group_at_name ));
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= bdb_group: \"%s\" not in \"%s\": %s\n", 
-			op_ndn, gr_ndn, group_at_name ); 
+			op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); 
 #endif
 		goto return_results;
 	}
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-		   "bdb_group: %s is in %s: %s\n",
-		   op_ndn, gr_ndn, group_at_name ));
+		"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", 
-		op_ndn, gr_ndn, group_at_name ); 
+		op_ndn->bv_val, gr_ndn->bv_val, group_at_name ); 
 #endif
 
 	rc = 0;
@@ -205,12 +211,12 @@ bdb_group(
 return_results:
 	if( target != e ) {
 		/* free entry */
-		bdb_entry_return( be, e );
+		bdb_cache_return_entry_r( &bdb->bi_cache, e );
 	}
 
 #ifdef NEW_LOGGING
 	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		   "bdb_group: rc=%d\n", rc ));
+		"bdb_group: rc=%d\n", rc ));
 #else
 	Debug( LDAP_DEBUG_TRACE, "bdb_group: rc=%d\n", rc, 0, 0 ); 
 #endif