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

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index aaefe20868..9ebe047e77 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -32,7 +32,6 @@
 #include <ldap_schema.h>
 
 #include "ldap_pvt_thread.h"
-#include "ldif.h"
 
 LDAP_BEGIN_DECL
 
@@ -219,6 +218,17 @@ typedef struct slap_ssf_set {
 #define SLAP_SCHERR_NOT_SUPPORTED	15
 #define SLAP_SCHERR_BAD_DESCR	16
 
+typedef union slap_sockaddr {
+	struct sockaddr sa_addr;
+	struct sockaddr_in sa_in_addr;
+#ifdef LDAP_PF_INET6
+	struct sockaddr_in6 sa_in6_addr;
+#endif
+#ifdef LDAP_PF_LOCAL
+	struct sockaddr_un sa_un_addr;
+#endif
+} Sockaddr;
+
 typedef struct slap_oid_macro {
 	struct berval som_oid;
 	char **som_names;
@@ -335,6 +345,8 @@ typedef struct slap_matching_rule {
 
 /* this is used to kludge objectClass testing */
 #define SLAP_MR_MODIFY_MATCHING 0x0001U
+/* are we matching from a mr asserted value or a real value */
+#define SLAP_MR_VALUE_IS_IN_MR_SYNTAX	0x0002U
 
 	Syntax					*smr_syntax;
 	slap_mr_convert_func	*smr_convert;
@@ -354,9 +366,11 @@ typedef struct slap_matching_rule {
 #define smr_extensions		smr_mrule.mr_extensions
 } MatchingRule;
 
+struct slap_attr_desc;
+
 typedef struct slap_attribute_type {
-	char					*sat_cname;
 	LDAPAttributeType		sat_atype;
+	struct berval			sat_cname;
 	struct slap_attribute_type	*sat_sup;
 	struct slap_attribute_type	**sat_subtypes;
 	MatchingRule			*sat_equality;
@@ -364,7 +378,9 @@ typedef struct slap_attribute_type {
 	MatchingRule			*sat_ordering;
 	MatchingRule			*sat_substr;
 	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
@@ -409,15 +425,16 @@ typedef struct slap_object_class {
  * represents a recognized attribute description ( type + options )
  */
 typedef struct slap_attr_desc {
-	struct berval *ad_cname;	/* canonical name, must be specified */
+	struct slap_attr_desc *ad_next;
 	AttributeType *ad_type;		/* attribute type, must be specified */
-	char *ad_lang;				/* NULL if no language tags */
+	struct berval ad_cname;		/* canonical name, must be specified */
+	struct berval ad_lang;		/* empty if no language tags */
 	unsigned ad_flags;
 #define SLAP_DESC_NONE		0x0U
 #define SLAP_DESC_BINARY	0x1U
 } AttributeDescription;
 
-#define slap_ad_is_lang(ad)		( (ad)->ad_lang != NULL )
+#define slap_ad_is_lang(ad)		( (ad)->ad_lang.bv_len != 0 )
 #define slap_ad_is_binary(ad)	( (int)((ad)->ad_flags & SLAP_DESC_BINARY) ? 1 : 0 )
 
 /*
@@ -450,6 +467,7 @@ struct slap_internal_schema {
 	AttributeDescription *si_ad_supportedExtension;
 	AttributeDescription *si_ad_supportedLDAPVersion;
 	AttributeDescription *si_ad_supportedSASLMechanisms;
+	AttributeDescription *si_ad_supportedFeatures;
 
 	/* subschema subentry attribute descriptions */
 	AttributeDescription *si_ad_objectClasses;
@@ -478,6 +496,14 @@ struct slap_internal_schema {
 
 	/* Undefined Attribute Type */
 	AttributeType	*si_at_undefined;
+
+	/* Matching Rules */
+	MatchingRule	*si_mr_distinguishedNameMatch;
+	MatchingRule	*si_mr_integerMatch;
+
+	/* Syntaxes */
+	Syntax		*si_syn_distinguishedName;
+	Syntax		*si_syn_integer;
 };
 
 typedef struct slap_attr_assertion {
@@ -1127,6 +1153,9 @@ struct slap_backend_info {
 typedef struct slap_op {
 	ber_int_t	o_opid;		/* id of this operation		  */
 	ber_int_t	o_msgid;	/* msgid of the request		  */
+#ifdef LDAP_CONNECTIONLESS
+	Sockaddr	o_peeraddr;	/* UDP peer address		  */
+#endif
 
 	ldap_pvt_thread_t	o_tid;	/* thread handling this op	  */
 
@@ -1150,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
  */
@@ -1182,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 */
 
@@ -1194,6 +1237,9 @@ typedef struct slap_conn {
 	BerElement	*c_currentber;	/* ber we're attempting to read */
 	int		c_writewaiter;	/* true if writer is waiting */
 
+#ifdef LDAP_CONNECTIONLESS
+	int	c_is_udp;		/* true if this is (C)LDAP over UDP */
+#endif
 #ifdef HAVE_TLS
 	int	c_is_tls;		/* true if this LDAP over raw TLS */
 	int	c_needs_tls_accept;	/* true if SSL_accept should be called */