ITS#4832 fix unint'd var

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index fa30ea09cb9927a648017a1ad89985b88bd4e6e4..f4c1cf7d1d99f32796b03ab0d7f4f0149a257d24 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1538,6 +1538,8 @@ typedef struct slap_bindconf {
        int sb_version;
        int sb_tls;
        int sb_method;
+       int sb_timeout_api;
+       int sb_timeout_net;
        struct berval sb_binddn;
        struct berval sb_cred;
        struct berval sb_saslmech;
@@ -1650,14 +1652,18 @@ typedef BackendDB Backend;
 struct syncinfo_s;
 
 #define SLAP_SYNC_RID_SIZE     3
+#define SLAP_SYNC_SID_MAX      4095    /* based on liblutil/csn.c field width */
 #define SLAP_SYNCUUID_SET_SIZE 256
 
 #define        SLAP_SYNC_UPDATE_MSGID  1
 
 struct sync_cookie {
-       struct berval ctxcsn;
+       struct berval *ctxcsn;
        struct berval octet_str;
-       long rid;
+       int rid;
+       int sid;
+       int numcsns;
+       int *sids;
        LDAP_STAILQ_ENTRY(sync_cookie) sc_next;
 };
 
@@ -1913,6 +1919,7 @@ typedef struct req_compare_s {
 typedef struct req_modify_s {
        Modifications *rs_modlist;
        int rs_increment;               /* FIXME: temporary */
+       char rs_no_opattrs;             /* don't att modify operational attrs */
 } req_modify_s;
 
 typedef struct req_modrdn_s {
@@ -2466,6 +2473,7 @@ typedef struct slap_op {
 #define orn_msgid oq_abandon.rs_msgid
 #define orm_modlist oq_modify.rs_modlist
 #define orm_increment oq_modify.rs_increment
+#define orm_no_opattrs oq_modify.rs_no_opattrs
 
 #define ore_reqoid oq_extended.rs_reqoid
 #define ore_flags oq_extended.rs_flags
@@ -2480,6 +2488,7 @@ typedef struct slap_op {
        GroupAssertion *o_groups;
        char o_do_not_cache;    /* don't cache groups from this op */
        char o_is_auth_check;   /* authorization in progress */
+       slap_access_t o_acl_priv;
 
        char o_nocaching;
        char o_delete_glue_parent;