misc cleanup

[openldap] / servers / slapd / back-bdb / back-bdb.h

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index c6743eb3153c21cf7c52a9b7188ff65f0660ea3a..d8880b314767addc78ce4930f58f8247b1d5eb7c 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -14,6 +14,10 @@
 
 LDAP_BEGIN_DECL
 
+#ifdef LDAP_SYNCREPL
+#define BDB_SUBENTRIES 1
+#endif
+
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
 #define DN_SUBTREE_PREFIX      '@'
@@ -90,7 +94,10 @@ typedef struct bdb_entry_info {
         * remaining fields require backend cache lock to access
         */
        struct berval bei_nrdn;
+#ifdef BDB_HIER
        struct berval bei_rdn;
+       int     bei_modrdns;
+#endif
        Entry   *bei_e;
        Avlnode *bei_kids;
        ldap_pvt_thread_mutex_t bei_kids_mutex;
@@ -149,11 +156,9 @@ struct bdb_info {
        int                     bi_lock_detect;
        long            bi_shm_key;
 
-       int             bi_is_hier;
-
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+#ifdef LDAP_SYNC
        LDAP_LIST_HEAD(pl, slap_op) bi_psearch_list;
 #endif
 #ifdef SLAP_IDL_CACHE
@@ -214,16 +219,14 @@ struct bdb_op_info {
        (db)->open(db, txn, file, name, type, flags, mode)
 #endif
 
-#define BDB_REUSE_LOCKERS
-
-#ifdef BDB_REUSE_LOCKERS
-#define        LOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)
-#else
-#define        LOCK_ID_FREE(env, locker)       XLOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)            XLOCK_ID(env, locker)
 #endif
 
+#define BDB_REUSE_LOCKERS
+
+#ifdef LDAP_SYNC
+#define BDB_CSN_COMMIT 0
+#define BDB_CSN_ABORT  1
+#define BDB_CSN_RETRY  2
 #endif
 
 LDAP_END_DECL