Fix prev commit, config_obsolete

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index fb825c97cb5c0ae717b2c7c31f5293ea36a2c138..cb0bbcbac5d9a383b4285a8bf0e474f37a362b5e 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1569,14 +1569,6 @@ typedef struct slap_bindconf {
 #endif
 } slap_bindconf;
 
-struct slap_replica_info {
-       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 */
-       slap_bindconf ri_bindconf;      /* for back-config */
-};
-
 typedef struct slap_verbmasks {
        struct berval word;
        const slap_mask_t mask;
@@ -1857,11 +1849,6 @@ struct BackendDB {
        slap_access_t   be_dfltaccess;  /* access given if no acl matches          */
 
        /* Replica Information */
-       struct slap_replica_info **be_replica;  /* replicas of this backend (in master) */
-       char    *be_replogfile; /* replication log file (in master)        */
-       char    *be_replica_argsfile; /* per-replog replica args file */
-       char    *be_replica_pidfile; /* per-replog replica pid file */
-       int     be_replicationinterval; /* per-replog replicationinterval */
        struct berval be_update_ndn;    /* allowed to make changes (in replicas) */
        BerVarray       be_update_refs; /* where to refer modifying clients to */
        struct          be_pcl  *be_pending_csn_list;
@@ -2682,7 +2669,8 @@ struct Connection {
 
 #define        CONN_IS_TLS     1
 #define        CONN_IS_UDP     2
-#define        CONN_IS_CLIENT  3
+#define        CONN_IS_CLIENT  4
+#define        CONN_IS_IPC     8
 
 #ifdef LDAP_CONNECTIONLESS
        int     c_is_udp;               /* true if this is (C)LDAP over UDP */