Fix compiler error and warnings.

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 0adc7cdbd234f9a03d3ad79e0f20f26441d0bdfc..08e336ef709de554c0329396fffd804518edc8b9 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1392,11 +1392,29 @@ LDAP_SLAPD_V (int) slapMode;
 #define        SLAP_TOOL_READONLY      0x0400
 #define        SLAP_TOOL_QUICK         0x0800
 
+#define SB_TLS_OFF             0
+#define SB_TLS_ON              1
+#define SB_TLS_CRITICAL        2
+
+typedef struct slap_bindconf {
+       int sb_tls;
+       int sb_method;
+       char *sb_binddn;
+       char *sb_cred;
+       char *sb_saslmech;
+       char *sb_secprops;
+       char *sb_realm;
+       char *sb_authcId;
+       char *sb_authzId;
+} slap_bindconf;
+
 struct slap_replica_info {
-       char *ri_host;                          /* supersedes be_replica */
-       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 */
 };
 
 struct slap_limits_set {
@@ -1462,7 +1480,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
 
@@ -1486,30 +1503,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;
-#define SYNCINFO_TLS_OFF               0
-#define SYNCINFO_TLS_ON                        1
-#define SYNCINFO_TLS_CRITICAL  2
-        int                                    si_tls;
-        int                                    si_bindmethod;
-        char                           *si_binddn;
-        char                           *si_passwd;
-        char                           *si_saslmech;
-        char                           *si_secprops;
-        char                           *si_realm;
-        char                           *si_authcId;
-        char                           *si_authzId;
-               int                                     si_schemachecking;
+        struct berval          si_provideruri;
+               slap_bindconf           si_bindconf;
         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;
@@ -1702,7 +1709,6 @@ struct slap_backend_db {
        ldap_pvt_thread_mutex_t                                 *be_pcl_mutexp;
        syncinfo_t                                                              *be_syncinfo; /* For syncrepl */
 
-       char    *be_realm;
        void    *be_pb;         /* Netscape plugin */
        struct ConfigTable *be_cf_table;
 
@@ -1748,7 +1754,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 {
@@ -2236,7 +2241,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