Add calls to module_init/module_kill to support dynamically loaded backends.

[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 2d7075b9931d1143eb6046400700d83671eea046..d724733552cf6994e43c9eea0765e828c8354759 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -15,7 +15,6 @@
 
 LDAP_BEGIN_DECL
 
-#define BDB_IDL_MULTI          1
 /* #define BDB_HIER            1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
@@ -50,22 +49,14 @@ LDAP_BEGIN_DECL
 /* The bdb on-disk entry format is pretty space-inefficient. Average
  * sized user entries are 3-4K each. You need at least two entries to
  * fit into a single database page, more is better. 64K is BDB's
- * upper bound. The same issues arise with IDLs in the index databases,
- * but it's nearly impossible to avoid overflows there.
- *
- * When using BDB_IDL_MULTI, the IDL size is no longer an issue. Smaller
- * pages are better for concurrency.
+ * upper bound. Smaller pages are better for concurrency.
  */
 #ifndef BDB_ID2ENTRY_PAGESIZE
 #define        BDB_ID2ENTRY_PAGESIZE   16384
 #endif
 
 #ifndef BDB_PAGESIZE
-#ifdef BDB_IDL_MULTI
 #define        BDB_PAGESIZE    4096    /* BDB's original default */
-#else
-#define        BDB_PAGESIZE    16384
-#endif
 #endif
 
 #define DEFAULT_CACHE_SIZE     1000
@@ -171,6 +162,13 @@ struct bdb_op_info {
 #define XLOCK_ID(env, locker)          (env)->lock_id(env, locker)
 #define XLOCK_ID_FREE(env, locker)     (env)->lock_id_free(env, locker)
 
+/* BDB 4.1.17 adds txn arg to db->open */
+#if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17
+#undef DB_OPEN
+#define        DB_OPEN(db, file, name, type, flags, mode) \
+       (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode)
+#endif
+
 #define BDB_REUSE_LOCKERS
 
 #ifdef BDB_REUSE_LOCKERS
@@ -181,12 +179,6 @@ struct bdb_op_info {
 #define        LOCK_ID(env, locker)            XLOCK_ID(env, locker)
 #endif
 
-#if DB_VERSION_MINOR > 1 || DB_VERSION_PATCH >= 17
-#undef DB_OPEN
-#define        DB_OPEN(db, file, name, type, flags, mode) \
-       (db)->open(db, NULL, file, name, type, (flags)|DB_AUTO_COMMIT, mode)
-#endif
-
 #endif
 
 LDAP_END_DECL