X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fgroup.c;h=f8d5074bc8ff5dba34a8977ffe077b7a5fe9f6f3;hb=82540c5cc1be5bf17b22f3a41d12d1bc56180654;hp=3a4dde44863ff0fe2bc6fb2f2f1a8f9f93c82710;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap

diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index 3a4dde4486..f8d5074bc8 100644
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -48,9 +48,9 @@ ldbm_back_group(
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+	LDAP_LOG( BACK_LDBM, ENTRY, 
 		"ldbm_back_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,
 		"=> ldbm_back_group: gr dn: \"%s\"\n",
@@ -68,13 +68,12 @@ ldbm_back_group(
 		target->e_ndn, 0, 0 ); 
 #endif
 
-	if (strcmp(target->e_ndn, gr_ndn->bv_val) == 0) {
+	if (dn_match(&target->e_nname, gr_ndn)) {
 		/* we already have a LOCKED copy of the entry */
 		e = target;
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			"ldbm_back_group: target is group (%s)\n",
-			gr_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_group: target is group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ARGS,
 			"=> ldbm_back_group: target is group: \"%s\"\n",
@@ -86,9 +85,9 @@ ldbm_back_group(
 		/* can we find group entry with reader lock */
 		if ((e = dn2entry_r(be, gr_ndn, NULL )) == NULL) {
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-				"ldbm_back_group: cannot find group (%s)\n",
-				gr_ndn->bv_val ));
+			LDAP_LOG( BACK_LDBM, DETAIL1, 
+				"ldbm_back_group: cannot find group (%s)\n", 
+				gr_ndn->bv_val, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ACL,
 				"=> ldbm_back_group: cannot find group: \"%s\"\n",
@@ -99,8 +98,8 @@ ldbm_back_group(
 		}
 		
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-			"ldbm_back_group: found group (%s)\n", gr_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, DETAIL1, 
+			"ldbm_back_group: found group (%s)\n", gr_ndn->bv_val, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"=> ldbm_back_group: found group: \"%s\"\n",
@@ -119,9 +118,8 @@ ldbm_back_group(
 	
 	if( is_entry_alias( e ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_group: group (%s) is an alias\n",
-			gr_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_group: group (%s) is an alias\n", gr_ndn->bv_val, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_group: group is an alias\n", 0, 0, 0 );
@@ -132,9 +130,8 @@ ldbm_back_group(
 
 	if( is_entry_referral( e ) ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_group: group (%s) is a referral.\n",
-			gr_ndn->bv_val ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_group: group (%s) is a referral.\n", gr_ndn->bv_val,0,0);
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_group: group is an referral\n", 0, 0, 0 );
@@ -143,11 +140,11 @@ ldbm_back_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,
+		LDAP_LOG( BACK_LDBM, ERR, 
 			"ldbm_back_group: failed to find %s in objectClass.\n",
-			group_oc_name ));
+			group_oc_name, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_group: failed to find %s in objectClass\n", 
@@ -159,8 +156,8 @@ ldbm_back_group(
 
 	if ((attr = attr_find(e->e_attrs, group_at)) == NULL) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-			"ldbm_back_group: failed to find %s\n", group_at_name ));
+		LDAP_LOG( BACK_LDBM, INFO, 
+			"ldbm_back_group: failed to find %s\n", group_at_name, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ACL,
 			"<= ldbm_back_group: failed to find %s\n",
@@ -171,9 +168,9 @@ ldbm_back_group(
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
+	LDAP_LOG( BACK_LDBM, ENTRY, 
 		   "ldbm_back_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,
 		"<= ldbm_back_group: found objectClass %s and %s\n",
@@ -183,9 +180,9 @@ ldbm_back_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_LDBM, DETAIL1, 
 			"ldbm_back_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,
 			"<= ldbm_back_group: \"%s\" not in \"%s\": %s\n", 
@@ -197,9 +194,9 @@ ldbm_back_group(
 
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
+	LDAP_LOG( BACK_LDBM, DETAIL1, 
 		"ldbm_back_group: %s is 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,
 		"<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", 
@@ -216,8 +213,7 @@ return_results:
 	}
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-		"ldbm_back_group: rc=%d\n", rc ));
+	LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_group: rc=%d\n", rc, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: rc=%d\n", rc, 0, 0 ); 
 #endif