X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=9ebe047e77c619e80cb42e009966cd3062dd1bb7;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=48298e71e04d85b996d0a7a337a5b9d8af2c69e5;hpb=5f8058f957b14a7924c6cf3d79dd34e700c396f9;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 48298e71e0..9ebe047e77 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -370,7 +370,7 @@ struct slap_attr_desc;
 
 typedef struct slap_attribute_type {
 	LDAPAttributeType		sat_atype;
-	char				*sat_cname;
+	struct berval			sat_cname;
 	struct slap_attribute_type	*sat_sup;
 	struct slap_attribute_type	**sat_subtypes;
 	MatchingRule			*sat_equality;
@@ -380,6 +380,7 @@ typedef struct slap_attribute_type {
 	Syntax				*sat_syntax;
 	struct slap_attr_desc		*sat_ad;
 	struct slap_attribute_type	*sat_next;
+	ldap_pvt_thread_mutex_t		sat_ad_mutex;
 #define sat_oid			sat_atype.at_oid
 #define sat_names		sat_atype.at_names
 #define sat_desc		sat_atype.at_desc
@@ -1178,6 +1179,19 @@ typedef struct slap_op {
 	void	*o_private;	/* anything the backend needs	  */
 } Operation;
 
+/*
+ * Caches the result of a backend_group check for ACL evaluation
+ */
+typedef struct slap_gacl {
+	struct slap_gacl *next;
+	Backend *be;
+	ObjectClass *oc;
+	AttributeDescription *at;
+	int res;
+	int len;
+	char ndn[1];
+} GroupAssertion;
+
 /*
  * represents a connection from an ldap client
  */
@@ -1210,6 +1224,7 @@ typedef struct slap_conn {
 	Backend *c_authz_backend;
 
 	AuthorizationInformation c_authz;
+	GroupAssertion *c_groups;
 
 	ber_int_t	c_protocol;	/* version of the LDAP protocol used by client */