Added bdb_attribute and bdb_group ACL support routines

[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 b3fd31f38375f6644220ceda62ef98b5b354c15c..79b45ec0c96cb729ade5a17b5fc5230ce9b2fd01 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -15,10 +15,8 @@
 
 LDAP_BEGIN_DECL
 
-#define BDB_INDEX 1
-/* #define BDB_REINDEX 1 */
 /* #define BDB_FILTER_INDICES 1 */
-#define BDB_CONFIG_INDICES 1
+/* #define SLAPD_USE_AD 1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
 #define DN_ONE_PREFIX          '%'
@@ -44,11 +42,14 @@ LDAP_BEGIN_DECL
 
 #define BDB_SUFFIX             ".bdb"
 #define BDB_NEXTID             0
-#define BDB_DN2ID              1
-#define BDB_ID2ENTRY   2
-#define BDB_INDICES            3
+#define BDB_ID2ENTRY   1
+#define BDB_DN2ID              2
+#define BDB_NDB                        3
+
+#define BDB_INDICES            128
 
 struct bdb_db_info {
+       char            *bdi_name;
        DB                      *bdi_db;
 };
 
@@ -63,6 +64,10 @@ struct bdb_info {
 
        int                     bi_ndatabases;
        struct bdb_db_info **bi_databases;
+       ldap_pvt_thread_mutex_t bi_database_mutex;
+
+       slap_mask_t     bi_defaultmask;
+       Avlnode         *bi_attrs;
 
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
@@ -74,11 +79,6 @@ struct bdb_info {
        ldap_pvt_thread_t       bi_lock_detect_tid;
 #endif
 
-#if BDB_CONFIG_INDICES
-       slap_mask_t     bi_defaultmask;
-       Avlnode         *bi_attrs;
-#endif
-
        ID                      bi_lastid;
 };