Fix previous commit, BDB_REUSE_LOCKERS was inside a BDB version #ifdef

but is not version-dependent.

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 2d7075b9931d1143eb6046400700d83671eea046..18d2ab941999e43e04352a8956cc099844d17316 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -171,6 +171,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 +188,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