X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fgroup.c;h=9087c8524c793a854a7afd0b38d1d007911b74a3;hb=2c87d24f31d29bed606b443ef2d8e881b87207c7;hp=a889041c25254e242e4c88d328e074dd87604c44;hpb=d5bc2084be320a8a434936d9ec8a30f397cd8c16;p=openldap

diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
index a889041c25..9087c8524c 100644
--- a/servers/slapd/back-ldbm/group.c
+++ b/servers/slapd/back-ldbm/group.c
@@ -13,17 +13,18 @@
 
 
 #ifdef SLAPD_ACLGROUPS
-/* return 0 IFF edn is a value in member attribute
- * of entry with bdn AND that entry has an objectClass
+/* return 0 IFF op_dn is a value in member attribute
+ * of entry with gr_dn AND that entry has an objectClass
  * value of groupOfNames
  */
 int
 ldbm_back_group(
-	Backend     *be,
-        char        *bdn,
-        char        *edn,
-        char        *objectclassValue,
-        char        *groupattrName
+	Backend	*be,
+	Entry	*target,
+	char	*gr_ndn,
+	char	*op_ndn,
+	char	*objectclassValue,
+	char	*groupattrName
 )
 {
         struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
@@ -33,26 +34,47 @@ ldbm_back_group(
         Attribute   *member;
         int          rc;
 
-	Debug( LDAP_DEBUG_TRACE, "=> ldbm_back_group: bdn: %s\n", bdn, 0, 0 ); 
-	Debug( LDAP_DEBUG_TRACE, "=> ldbm_back_group: edn: %s\n", edn, 0, 0 ); 
-	Debug( LDAP_DEBUG_TRACE, "=> ldbm_back_group: objectClass: %s attrName: %s\n", 
-                objectclassValue, groupattrName, 0 ); 
-
-        /* can we find bdn entry with reader lock */
-        if ((e = dn2entry_r(be, bdn, &matched )) == NULL) {
-                Debug( LDAP_DEBUG_TRACE, "=> ldbm_back_group: cannot find bdn: %s matched: %s\n", bdn, (matched ? matched : ""), 0 ); 
-                if (matched != NULL)
-                        free(matched);
-                return( 1 );
+	Debug( LDAP_DEBUG_TRACE,
+		"=> ldbm_back_group: gr dn: \"%s\"\n",
+		gr_ndn, 0, 0 ); 
+	Debug( LDAP_DEBUG_TRACE,
+		"=> ldbm_back_group: op dn: \"%s\"\n",
+		op_ndn, 0, 0 ); 
+	Debug( LDAP_DEBUG_TRACE,
+		"=> ldbm_back_group: objectClass: \"%s\" attrName: \"%s\"\n", 
+		objectclassValue, groupattrName, 0 ); 
+
+	Debug( LDAP_DEBUG_TRACE,
+		"=> ldbm_back_group: tr dn: \"%s\"\n",
+		target->e_ndn, 0, 0 ); 
+
+	if (strcmp(target->e_ndn, gr_ndn) == 0) {
+		/* we already have a LOCKED copy of the entry */
+		e = target;
+        	Debug( LDAP_DEBUG_ARGS,
+			"=> ldbm_back_group: target is group: \"%s\"\n",
+			gr_ndn, 0, 0 ); 
+	} else {
+		/* can we find group entry with reader lock */
+		if ((e = dn2entry_r(be, gr_ndn, &matched )) == NULL) {
+			Debug( LDAP_DEBUG_TRACE,
+				"=> ldbm_back_group: cannot find group: \"%s\" matched: \"%s\"\n",
+					gr_ndn, (matched ? matched : ""), 0 ); 
+			if (matched != NULL)
+				free(matched);
+			return( 1 );
+		}
+		Debug( LDAP_DEBUG_ARGS,
+			"=> ldbm_back_group: found group: \"%s\"\n",
+			gr_ndn, 0, 0 ); 
         }
 
-        Debug( LDAP_DEBUG_ARGS, "=> ldbm_back_group: found bdn: %s\n", bdn, 0, 0 ); 
 
         /* check for deleted */
 
         /* find it's objectClass and member attribute values
          * make sure this is a group entry
-         * finally test if we can find edn in the member attribute value list *
+         * finally test if we can find op_dn in the member attribute value list *
          */
         
         rc = 1;
@@ -71,8 +93,8 @@ ldbm_back_group(
             bvObjectClass.bv_val = objectclassValue;
             bvObjectClass.bv_len = strlen( bvObjectClass.bv_val );         
 
-            bvMembers.bv_val = edn;
-            bvMembers.bv_len = strlen( edn );         
+            bvMembers.bv_val = op_ndn;
+            bvMembers.bv_len = strlen( op_ndn );         
 
             if (value_find(objectClass->a_vals, &bvObjectClass, SYNTAX_CIS, 1) != 0) {
                 Debug( LDAP_DEBUG_TRACE,
@@ -80,20 +102,25 @@ ldbm_back_group(
                         objectclassValue, 0, 0 ); 
             }
             else if (value_find(member->a_vals, &bvMembers, SYNTAX_CIS, 1) != 0) {
-                Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: %s not in %s: %s\n", 
-                        edn, bdn, groupattrName ); 
+                Debug( LDAP_DEBUG_ACL,
+					"<= ldbm_back_group: \"%s\" not in \"%s\": %s\n", 
+					op_ndn, gr_ndn, groupattrName ); 
             }
             else {
-                Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: %s is in %s: %s\n", 
-                        edn, bdn, groupattrName ); 
+				Debug( LDAP_DEBUG_ACL,
+					"<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", 
+					op_ndn, gr_ndn, groupattrName ); 
                 rc = 0;
             }
         }
 
-        /* free entry and reader lock */
-        cache_return_entry_r( &li->li_cache, e );                 
-        Debug( LDAP_DEBUG_ARGS, "ldbm_back_group: rc: %d\n", rc, 0, 0 ); 
-        return(rc);
+	if( target != e ) {
+		/* free entry and reader lock */
+		cache_return_entry_r( &li->li_cache, e );                 
+	}
+
+	Debug( LDAP_DEBUG_ARGS, "ldbm_back_group: rc: %d\n", rc, 0, 0 ); 
+	return(rc);
 }
 #endif /* SLAPD_ACLGROUPS */