Fix up back-bdb framework

diff --git a/configure b/configure
index f9ee2cb1166ffffd244ded0550634efe53fb622b..f36b70ea2e4eb0c26b2701cdc0598b81ef73ed17 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.330 2000/09/15 01:27:25 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.331 2000/09/18 17:02:09 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -16208,6 +16208,7 @@ fi
   
   
   
+  
 
 
 
@@ -16442,6 +16443,7 @@ s%@BUILD_PERL@%$BUILD_PERL%g
 s%@BUILD_SHELL@%$BUILD_SHELL%g
 s%@BUILD_SQL@%$BUILD_SQL%g
 s%@BUILD_TCL@%$BUILD_TCL%g
+s%@BUILD_BDB_DYNAMIC@%$BUILD_BDB_DYNAMIC%g
 s%@BUILD_DNSSRV_DYNAMIC@%$BUILD_DNSSRV_DYNAMIC%g
 s%@BUILD_LDAP_DYNAMIC@%$BUILD_LDAP_DYNAMIC%g
 s%@BUILD_LDBM_DYNAMIC@%$BUILD_LDBM_DYNAMIC%g

diff --git a/configure.in b/configure.in
index ded39a57a28215ccc4118fc191d287854df7f084..1dc6f7b67755908217b53317d13b61b00e108715 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2387,6 +2387,7 @@ AC_SUBST(BUILD_SLAPD)
   AC_SUBST(BUILD_SHELL)
   AC_SUBST(BUILD_SQL)
   AC_SUBST(BUILD_TCL)
+  AC_SUBST(BUILD_BDB_DYNAMIC)
   AC_SUBST(BUILD_DNSSRV_DYNAMIC)
   AC_SUBST(BUILD_LDAP_DYNAMIC)
   AC_SUBST(BUILD_LDBM_DYNAMIC)

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 63963ce1572e4fcde4a04185edb3836a3fc74bb5..b3601e89c692c7b2e45bcf8cb07c3b053dd42d01 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -13,17 +13,15 @@
 
 LDAP_BEGIN_DECL
 
-#define DEFAULT_MODE           0600
-#define DEFAULT_CACHE_SIZE     1000
-
-#define DEFAULT_DBCACHE_SIZE (100 * DEFAULT_DB_PAGE_SIZE)
+#define SLAPD_BDB_PRIVATE
 
-#define DEFAULT_DB_DIRECTORY   LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
+#define DEFAULT_MODE           0600
 
 #define DEFAULT_DBENV_HOME     LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb-home"
 #define DEFAULT_DBENV_MODE     DEFAULT_MODE
 
-#define DEFAULT_BLOCKSIZE      8192
+#define DEFAULT_DB_DIRECTORY   LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
+#define DEFAULT_DB_MODE        DEFAULT_MODE
 
 struct bdb_dbinfo {
        DB_ENV          *bdi_dbenv;

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 3941f4f93964012c4c3d2c66b2880f45dbced798..a31a5f62a154bdee18d71939db4a030eda2690ec 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -174,8 +174,13 @@ bdb_back_db_open(
                return rc;
        }
 
+#ifdef SLAPD_BDB_PRIVATE
        flags = DB_INIT_LOCK | DB_INIT_TXN |
                DB_PRIVATE | DB_RECOVER | DB_THREAD;
+#else
+       flags = DB_INIT_LOCK | DB_INIT_TXN | DB_INIT_MPOOL |
+               DB_RECOVER | DB_THREAD;
+#endif
 
        rc = bdi->bdi_dbenv->open( bdi->bdi_dbenv,
                bdi->bdi_dbenv_home,