From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 25 Oct 1998 16:43:11 +0000 (+0000)
Subject: Revert to current schema
X-Git-Tag: OPENLDAP_REL_ENG_1_0_3~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330863205ed40f3f57bf8f81eba4b8599d4cc9c9;p=thirdparty%2Fopenldap.git

Revert to current schema
	"uniqueMember" -> "member"
	"groupOfUniqueNames" uniqueMember" -> "groupOfNames"
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 95ad259426..435ae709a0 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -25,7 +25,6 @@ static int	regex_matches();
 static string_expand(char *newbuf, int bufsiz, char *pattern,
 	char *match, regmatch_t *matches);
 
-extern Entry * be_dn2entry(Backend *be, char *bdn, char **matched);
 
 /*
  * access_allowed - check whether dn is allowed the requested access
@@ -367,7 +366,7 @@ acl_access_allowed(
 
 			/* b->a_group is an unexpanded entry name, expanded it should be an 
 			 * entry with objectclass group* and we test to see if odn is one of
-			 * the values in the attribute uniquegroup
+			 * the values in the attribute group
 			 */
 			Debug( LDAP_DEBUG_ARGS, "<= check a_group: %s\n",
 				b->a_group, 0, 0);
@@ -549,7 +548,7 @@ regex_matches(
 		char error[512];
 		regerror(rc, &re, error, sizeof(error));
 
-		Debug( LDAP_DEBUG_ANY,
+		Debug( LDAP_DEBUG_TRACE,
 		    "compile( \"%s\", \"%s\") failed %s\n",
 			pat, str, error );
 		return( 0 );
diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c
new file mode 100644
index 0000000000..51960be086
--- /dev/null
+++ b/servers/slapd/back-ldbm/group.c
@@ -0,0 +1,91 @@
+/* compare.c - ldbm backend compare routine */
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include "slap.h"
+#include "back-ldbm.h"
+
+extern Entry            *dn2entry();
+extern Attribute        *attr_find();
+
+
+#ifdef ACLGROUP
+/* return 0 IFF edn is a value in member attribute
+ * of entry with bdn AND that entry has an objectClass
+ * value of groupOfNames
+ */
+int
+ldbm_back_group(
+	Backend     *be,
+        char        *bdn,
+        char        *edn
+)
+{
+        struct ldbminfo *li = (struct ldbminfo *) be->be_private;    
+        Entry        *e;
+        char        *matched;
+        Attribute   *objectClass;
+        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 ); 
+
+        /* can we find bdn entry */
+        if ((e = dn2entry(be, bdn, &matched )) == NULL) {
+                Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: cannot find bdn: %s matched: %x\n", bdn, matched, 0 ); 
+                if (matched != NULL)
+                        free(matched);
+                return( 1 );
+        }
+        Debug( LDAP_DEBUG_ARGS, "ldbm_back_group: found bdn: %s matched: %x\n", bdn, matched, 0 ); 
+
+
+        /* 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 *
+         */
+        
+        rc = 1;
+        if ((objectClass = attr_find(e->e_attrs, "objectclass")) == NULL)  {
+            Debug( LDAP_DEBUG_TRACE, "ldbm_back_group: failed to find objectClass\n", 0, 0, 0 ); 
+        }
+        else if ((member = attr_find(e->e_attrs, "member")) == NULL) {
+            Debug( LDAP_DEBUG_TRACE, "<= ldbm_back_group: failed to find member\n", 0, 0, 0 ); 
+        }
+        else {
+            struct berval bvObjectClass;
+            struct berval bvMembers;
+
+            Debug( LDAP_DEBUG_ARGS, "<= ldbm_back_group: found objectClass and members\n", 0, 0, 0 ); 
+
+            bvObjectClass.bv_val = "groupofnames";
+            bvObjectClass.bv_len = strlen( bvObjectClass.bv_val );         
+            bvMembers.bv_val = edn;
+            bvMembers.bv_len = strlen( edn );         
+
+            if (value_find(objectClass->a_vals, &bvObjectClass, SYNTAX_CIS, 1) != 0) {
+                Debug( LDAP_DEBUG_TRACE,
+					"<= ldbm_back_group: failed to find objectClass in groupOfNames\n", 
+                        0, 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: groupOfNames\n", 
+                        edn, bdn, 0 ); 
+            }
+            else {
+                Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: %s is in %s: groupOfNames\n", 
+                        edn, bdn, 0 ); 
+                rc = 0;
+            }
+        }
+
+        /* free e */
+        cache_return_entry( &li->li_cache, e );                 
+        Debug( LDAP_DEBUG_ARGS, "ldbm_back_group: rc: %d\n", rc, 0, 0 ); 
+        return(rc);
+}
+#endif
+