X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fslap.h;h=05fa37faa429dc21cc49145b937e1c47e1db5f13;hb=61312e7989b6b0cf97b859caf4b43fa7e70741c8;hp=b4e7e187a32fac1895021e72285ca185d78951cb;hpb=bf110af72358faeec77524b197417dcea85dd28e;p=openldap

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index b4e7e187a3..05fa37faa4 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1145,7 +1145,13 @@ typedef struct slap_entry {
  * A list of LDAPMods
  */
 typedef struct slap_mod {
-	int sm_op;
+	short sm_op;
+	short sm_flags;
+/* Set for internal mods, will bypass ACL checks. Only needed when
+ * running as non-root user, for user modifiable attributes.
+ */
+#define	SLAP_MOD_INTERNAL	0x01
+
 	AttributeDescription *sm_desc;
 	struct berval sm_type;
 	BerVarray sm_values;
@@ -1155,6 +1161,7 @@ typedef struct slap_mod {
 typedef struct slap_mod_list {
 	Modification sml_mod;
 #define sml_op		sml_mod.sm_op
+#define sml_flags	sml_mod.sm_flags
 #define sml_desc	sml_mod.sm_desc
 #define	sml_type	sml_mod.sm_type
 #define sml_values	sml_mod.sm_values
@@ -1433,6 +1440,7 @@ typedef struct slap_acl {
 	regex_t		acl_dn_re;
 	struct berval	acl_dn_pat;
 	AttributeName	*acl_attrs;
+	MatchingRule	*acl_attrval_mr;
 	slap_style_t	acl_attrval_style;
 	regex_t		acl_attrval_re;
 	struct berval	acl_attrval;
@@ -2284,6 +2292,7 @@ typedef struct slap_op {
 
 	ber_tag_t	o_tag;		/* tag of the request */
 	time_t		o_time;		/* time op was initiated */
+	int			o_tincr;	/* counter for multiple ops with same o_time */
 
 	BackendDB	*o_bd;	/* backend DB processing this op */
 	struct berval	o_req_dn;	/* DN of target of request */