X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=65319e1a6ef0955e7115a77c4950eef92c9469b9;hb=24db207196a453a4f9acdce08593c7e0ed53ce4c;hp=818a36bbac5c6b51e4393abd0430472f42f855f8;hpb=1a59d091bc974a2e2d5bb2697168e9c830d6bcf6;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 818a36bbac..65319e1a6e 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -101,6 +101,13 @@ LDAP_BEGIN_DECL
 #define SERVICE_NAME  OPENLDAP_PACKAGE "-slapd"
 #define SLAPD_ANONYMOUS ""
 
+#ifdef HAVE_TCPD
+# include <tcpd.h>
+# define SLAP_STRING_UNKNOWN	STRING_UNKNOWN
+#else /* ! TCP Wrappers */
+# define SLAP_STRING_UNKNOWN	"unknown"
+#endif /* ! TCP Wrappers */
+
 /* LDAPMod.mod_op value ===> Must be kept in sync with ldap.h!
  * This is a value used internally by the backends. It is needed to allow
  * adding values that already exist without getting an error as required by
@@ -683,10 +690,19 @@ struct AttributeType {
 
 #define SLAP_AT_MANAGEABLE		0x0800U	/* no-user-mod can be by-passed */
 
+/* Note: ORDERED values have an ordering specifically set by the
+ * user, denoted by the {x} ordering prefix on the values.
+ *
+ * SORTED values are simply sorted by memcmp. SORTED values can
+ * be efficiently located by binary search. ORDERED values have no
+ * such advantage. An attribute cannot have both properties.
+ */
 #define	SLAP_AT_ORDERED_VAL		0x0001U /* values are ordered */
 #define	SLAP_AT_ORDERED_SIB		0x0002U /* siblings are ordered */
 #define	SLAP_AT_ORDERED			0x0003U /* value has order index */
 
+#define	SLAP_AT_SORTED_VAL		0x0010U	/* values should be sorted */
+
 #define	SLAP_AT_HARDCODE		0x10000U	/* hardcoded schema */
 #define	SLAP_AT_DELETED			0x20000U
 
@@ -972,6 +988,11 @@ struct AttributeAssertion {
 	ComponentFilter		*aa_cf;		/* for attribute aliasing */
 #endif
 };
+#ifdef LDAP_COMP_MATCH
+#define ATTRIBUTEASSERTION_INIT { NULL, BER_BVNULL, NULL }
+#else
+#define ATTRIBUTEASSERTION_INIT { NULL, BER_BVNULL }
+#endif
 
 struct SubstringsAssertion {
 	AttributeDescription	*sa_desc;
@@ -1097,20 +1118,28 @@ struct ValuesReturnFilter {
 
 /*
  * represents an attribute (description + values)
+ * desc, vals, nvals, numvals fields must align with Modification
  */
 struct Attribute {
 	AttributeDescription	*a_desc;
 	BerVarray		a_vals;		/* preserved values */
 	BerVarray		a_nvals;	/* normalized values */
-#ifdef LDAP_COMP_MATCH
-	ComponentData		*a_comp_data;	/* component values */
-#endif
-	Attribute		*a_next;
+	unsigned		a_numvals;	/* number of vals */
 	unsigned		a_flags;
 #define SLAP_ATTR_IXADD			0x1U
 #define SLAP_ATTR_IXDEL			0x2U
 #define SLAP_ATTR_DONT_FREE_DATA	0x4U
 #define SLAP_ATTR_DONT_FREE_VALS	0x8U
+#define	SLAP_ATTR_SORTED_VALS		0x10U	/* values are sorted */
+
+/* These flags persist across an attr_dup() */
+#define	SLAP_ATTR_PERSISTENT_FLAGS \
+	SLAP_ATTR_SORTED_VALS
+
+	Attribute		*a_next;
+#ifdef LDAP_COMP_MATCH
+	ComponentData		*a_comp_data;	/* component values */
+#endif
 };
 
 
@@ -1157,8 +1186,13 @@ struct Entry {
 
 /*
  * A list of LDAPMods
+ * desc, values, nvalues, numvals must align with Attribute
  */
 struct Modification {
+	AttributeDescription *sm_desc;
+	BerVarray sm_values;
+	BerVarray sm_nvalues;
+	unsigned sm_numvals;
 	short sm_op;
 	short sm_flags;
 /* Set for internal mods, will bypass ACL checks. Only needed when
@@ -1166,11 +1200,7 @@ struct Modification {
  */
 #define	SLAP_MOD_INTERNAL	0x01
 #define	SLAP_MOD_MANAGING	0x02
-
-	AttributeDescription *sm_desc;
 	struct berval sm_type;
-	BerVarray sm_values;
-	BerVarray sm_nvalues;
 };
 
 struct Modifications {
@@ -1181,17 +1211,10 @@ struct Modifications {
 #define	sml_type	sml_mod.sm_type
 #define sml_values	sml_mod.sm_values
 #define sml_nvalues	sml_mod.sm_nvalues
+#define sml_numvals	sml_mod.sm_numvals
 	Modifications	*sml_next;
 };
 
-struct LDAPModList {
-	LDAPMod		ml_mod;
-	LDAPModList	*ml_next;
-#define ml_op		ml_mod.mod_op
-#define ml_type		ml_mod.mod_type
-#define ml_values	ml_mod.mod_values
-};
-
 /*
  * represents an access control list
  */