Fix up back-bdb framework

This commit is contained in:
Kurt Zeilenga 2000-09-18 20:03:41 +00:00
parent c3b0c9bd0a
commit 4077211117
4 changed files with 13 additions and 7 deletions

4
configure vendored
View file

@ -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

View file

@ -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)

View file

@ -13,17 +13,15 @@
LDAP_BEGIN_DECL
#define SLAPD_BDB_PRIVATE
#define DEFAULT_MODE 0600
#define DEFAULT_CACHE_SIZE 1000
#define DEFAULT_DBCACHE_SIZE (100 * DEFAULT_DB_PAGE_SIZE)
#define DEFAULT_DB_DIRECTORY LDAP_RUNDIR LDAP_DIRSEP "openldap-bdb"
#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;

View file

@ -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,