ITS#2919 move OpenLDAPtime to OpenLDAPperson

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6a1858c05b02c5142c1e8967df14c288712f6fc1..2214f0cb8e3247086e1e8f8b01724ac3f932a0d4 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -319,7 +319,8 @@ extern int slap_inet4or6;
 
 typedef struct slap_oid_macro {
        struct berval som_oid;
-       char **som_names;
+       BerVarray som_names;
+       BerVarray som_subs;
        LDAP_SLIST_ENTRY(slap_oid_macro) som_next;
 } OidMacro;
 
@@ -1409,14 +1410,22 @@ typedef struct slap_bindconf {
 } slap_bindconf;
 
 struct slap_replica_info {
-       char *ri_uri;                           /* supersedes be_replica */
-       char *ri_host;                          /* points to host part of uri */
-       BerVarray ri_nsuffix;   /* array of suffixes this replica accepts */
+       const char *ri_uri;                     /* supersedes be_replica */
+       const char *ri_host;            /* points to host part of uri */
+       BerVarray ri_nsuffix;           /* array of suffixes this replica accepts */
        AttributeName *ri_attrs;        /* attrs to replicate, NULL=all */
-       int ri_exclude;                 /* 1 => exclude ri_attrs */
+       int ri_exclude;                         /* 1 => exclude ri_attrs */
        slap_bindconf ri_bindconf;      /* for back-config */
 };
 
+typedef struct slap_verbmasks {
+       struct berval word;
+       const int mask;
+} slap_verbmasks;
+
+#define SLAP_LIMIT_TIME        1
+#define SLAP_LIMIT_SIZE        2
+
 struct slap_limits_set {
        /* time limits */
        int     lms_t_soft;
@@ -1480,7 +1489,6 @@ typedef BackendDB Backend;
  * syncinfo structure for syncrepl
  */
 
-#define SLAP_SYNC_SID_SIZE     3
 #define SLAP_SYNC_RID_SIZE     3
 #define SLAP_SYNCUUID_SET_SIZE 256
 
@@ -1504,19 +1512,20 @@ LDAP_STAILQ_HEAD( slap_sync_cookie_s, sync_cookie );
 typedef struct syncinfo_s {
         struct slap_backend_db *si_be;
         long                           si_rid;
-        struct berval                  si_provideruri;
+        struct berval          si_provideruri;
                slap_bindconf           si_bindconf;
-               int                                     si_schemachecking;
         struct berval          si_filterstr;
         struct berval          si_base;
         int                                    si_scope;
         int                                    si_attrsonly;
+               char                            *si_anfile;
                AttributeName           *si_anlist;
                AttributeName           *si_exanlist;
                char                            **si_attrs;
+               char                            **si_exattrs;
                int                                     si_allattrs;
                int                                     si_allopattrs;
-               char                            **si_exattrs;
+               int                                     si_schemachecking;
         int                                    si_type;
         time_t                         si_interval;
                time_t                          *si_retryinterval;
@@ -1754,7 +1763,6 @@ typedef struct req_search_s {
        AttributeName *rs_attrs;
        Filter *rs_filter;
        struct berval rs_filterstr;
-       int rs_post_search_id;
 } req_search_s;
 
 typedef struct req_compare_s {
@@ -2242,7 +2250,6 @@ typedef struct slap_op {
 #define ors_attrs oq_search.rs_attrs
 #define ors_filter oq_search.rs_filter
 #define ors_filterstr oq_search.rs_filterstr
-#define ors_post_search_id oq_search.rs_post_search_id
 
 #define orr_newrdn oq_modrdn.rs_newrdn
 #define orr_nnewrdn oq_modrdn.rs_nnewrdn