X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=95cb6c287606d2cc5d51472275bec273c387fddd;hb=a720011c8a05d610c737c4e7e299b03506ce810f;hp=36029c679abc73bf2a8187668daf0956b1bac9c3;hpb=8b457119ac08366b7c31c11968994c033bcbaf13;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 36029c679a..95cb6c2876 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -782,6 +782,7 @@ typedef struct slap_attr_desc {
 #define SLAP_DESC_NONE			0x00U
 #define SLAP_DESC_BINARY		0x01U
 #define SLAP_DESC_TAG_RANGE		0x80U
+#define SLAP_DESC_TEMPORARY		0x1000U
 } AttributeDescription;
 
 /* flags to slap_*2undef_ad to register undefined (0, the default)
@@ -977,7 +978,9 @@ typedef struct slap_mr_assertion {
  */
 typedef struct slap_filter {
 	ber_tag_t	f_choice;	/* values taken from ldap.h, plus: */
-#define SLAPD_FILTER_COMPUTED		((ber_tag_t) -1)
+#define SLAPD_FILTER_COMPUTED		0
+#define SLAPD_FILTER_MASK			0x7fff
+#define SLAPD_FILTER_UNDEFINED		0x8000
 
 	union f_un_u {
 		/* precomputed result */
@@ -1917,17 +1920,17 @@ typedef struct req_modify_s {
 } req_modify_s;
 
 typedef struct req_modrdn_s {
+	Modifications *rs_modlist;
 	struct berval rs_newrdn;
 	struct berval rs_nnewrdn;
 	struct berval *rs_newSup;
 	struct berval *rs_nnewSup;
 	int rs_deleteoldrdn;
-	Modifications *rs_modlist;
 } req_modrdn_s;
 
 typedef struct req_add_s {
-	Entry *rs_e;
 	Modifications *rs_modlist;	/* FIXME: temporary */
+	Entry *rs_e;
 } req_add_s;
 
 typedef struct req_abandon_s {