]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-bdb/init.c
use slab memory for proxyauthz
[openldap] / servers / slapd / back-bdb / init.c
index 5f7b81433a650d78269c93a4ca95198538bd367c..eff1b5db620375bf5c7791fa3c0187ca1d9fc391 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
 #include <ac/string.h>
 #include <ac/unistd.h>
 #include <ac/stdlib.h>
-
+#include <ac/errno.h>
+#include <sys/stat.h>
 #include "back-bdb.h"
-#include "external.h"
 #include <lutil.h>
+#include <ldap_rq.h>
+#include "alock.h"
 
 static const struct bdbi_database {
        char *file;
@@ -36,40 +38,17 @@ static const struct bdbi_database {
        { NULL, NULL, 0, 0 }
 };
 
-struct berval bdb_uuid = BER_BVNULL;
-
 typedef void * db_malloc(size_t);
 typedef void * db_realloc(void *, size_t);
 
-#if 0
-static int
-bdb_open( BackendInfo *bi )
-{
-       return 0;
-}
-
-static int
-bdb_destroy( BackendInfo *bi )
-{
-       return 0;
-}
-
-static int
-bdb_close( BackendInfo *bi )
-{
-       /* terminate the underlying database system */
-       return 0;
-}
-#endif
-
 static int
 bdb_db_init( BackendDB *be )
 {
        struct bdb_info *bdb;
 
-       Debug( LDAP_DEBUG_ANY,
-               "bdb_db_init: Initializing %s database\n",
-               be->bd_info->bi_type, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE,
+               LDAP_XSTRING(bdb_db_init) ": Initializing " BDB_UCTYPE " database\n",
+               0, 0, 0 );
 
        /* allocate backend-database-specific stuff */
        bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
@@ -85,54 +64,44 @@ bdb_db_init( BackendDB *be )
        bdb->bi_search_stack_depth = DEFAULT_SEARCH_STACK_DEPTH;
        bdb->bi_search_stack = NULL;
 
-       LDAP_LIST_INIT (&bdb->bi_psearch_list);
-
        ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
        ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
-       ldap_pvt_thread_rdwr_init ( &bdb->bi_pslist_rwlock );
-       ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
+#ifdef BDB_HIER
+       ldap_pvt_thread_mutex_init( &bdb->bi_modrdns_mutex );
+#endif
+       ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_head_mutex );
+       ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_tail_mutex );
        ldap_pvt_thread_mutex_init( &bdb->bi_cache.c_dntree.bei_kids_mutex );
        ldap_pvt_thread_rdwr_init ( &bdb->bi_cache.c_rwlock );
+       ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
+       ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
 
        be->be_private = bdb;
+       be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
        return 0;
 }
 
-int
-bdb_bt_compare(
-       DB *db, 
-       const DBT *usrkey,
-       const DBT *curkey )
-{
-       unsigned char *u, *c;
-       int i, x;
-
-       u = usrkey->data;
-       c = curkey->data;
-
-#ifdef WORDS_BIGENDIAN
-       for( i = 0; i < (int)sizeof(ID); i++)
-#else
-       for( i = sizeof(ID)-1; i >= 0; i--)
-#endif
-       {
-               x = u[i] - c[i];
-               if( x ) return x;
-       }
-
-       return 0;
-}
+static int
+bdb_db_close( BackendDB *be );
 
 static int
 bdb_db_open( BackendDB *be )
 {
        int rc, i;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+       struct stat stat1, stat2;
        u_int32_t flags;
-#ifdef HAVE_EBCDIC
        char path[MAXPATHLEN];
-#endif
+       char *dbhome;
+       int do_recover = 0, do_alock_recover = 0, open_env = 1, got_env = 0;
+
+       if ( be->be_suffix == NULL ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: need suffix\n",
+                       0, 0, 0 );
+               return -1;
+       }
 
        Debug( LDAP_DEBUG_ARGS,
                "bdb_db_open: %s\n",
@@ -145,141 +114,307 @@ bdb_db_open( BackendDB *be )
                return -1;
        }
 #endif
-       /* we should check existance of dbenv_home and db_directory */
 
-       rc = db_env_create( &bdb->bi_dbenv, 0 );
-       if( rc != 0 ) {
+       /* Check existence of dbenv_home. Any error means trouble */
+       rc = stat( bdb->bi_dbenv_home, &stat1 );
+       if( rc !=0 ) {
                Debug( LDAP_DEBUG_ANY,
-                       "bdb_db_open: db_env_create failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
-               return rc;
+                       "bdb_db_open: Cannot access database directory %s (%d)\n",
+                       bdb->bi_dbenv_home, errno, 0 );
+                       return -1;
+       }
+
+       /* Perform database use arbitration/recovery logic */
+       rc = alock_open( &bdb->bi_alock_info, 
+                               "slapd", 
+                               bdb->bi_dbenv_home,
+                               slapMode & SLAP_TOOL_READONLY ?
+                               ALOCK_LOCKED : ALOCK_UNIQUE );
+
+       if( rc == ALOCK_RECOVER ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: unclean shutdown detected;"
+                       " attempting recovery.\n", 
+                       0, 0, 0 );
+               do_alock_recover = 1;
+               do_recover = 1;
+       } else if( rc == ALOCK_BUSY ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: database already in use\n", 
+                       0, 0, 0 );
+               return -1;
+       } else if( rc != ALOCK_CLEAN ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: alock package is unstable\n", 
+                       0, 0, 0 );
+               return -1;
        }
 
-       flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
-               | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN;
-       
-#if 0
-       /* Never do automatic recovery, must perform it manually.
-        * Otherwise restarting with gentlehup will corrupt the
-        * database.
+       /*
+        * The DB_CONFIG file may have changed. If so, recover the
+        * database so that new settings are put into effect. Also
+        * note the possible absence of DB_CONFIG in the log.
         */
-       if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
-#endif
+       if( stat( bdb->bi_db_config_path, &stat1 ) == 0 ) {
+               if ( !do_recover ) {
+                       char *ptr = lutil_strcopy(path, bdb->bi_dbenv_home);
+                       *ptr++ = LDAP_DIRSEP[0];
+                       strcpy( ptr, "__db.001" );
+                       if( stat( path, &stat2 ) == 0 ) {
+                               if( stat2.st_mtime <= stat1.st_mtime ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "bdb_db_open: DB_CONFIG for suffix %s has changed.\n"
+                                               "Performing database recovery to activate new settings.\n",
+                                               be->be_suffix[0].bv_val, 0, 0 );
+                                       do_recover = 1;
+                               }
+                       }
+               }
+       }
+       else {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: Warning - No DB_CONFIG file found "
+                       "in directory %s: (%d)\n"
+                       "Expect poor performance for suffix %s.\n",
+                       bdb->bi_dbenv_home, errno, be->be_suffix[0].bv_val );
+       }
 
-       /* If a key was set, use shared memory for the BDB environment */
-       if ( bdb->bi_shm_key ) {
-               bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
-               flags |= DB_SYSTEM_MEM;
+       rc = db_env_create( &bdb->bi_dbenv, 0 );
+       if( rc != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: db_env_create failed: %s (%d)\n",
+                       db_strerror(rc), rc, 0 );
+               goto fail;
        }
 
        bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
        bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
+
        bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
 
        /* One long-lived TXN per thread, two TXNs per write op */
-       bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, SLAPD_GLOBAL(connection_pool_max) * 3 );
-
-       if ( bdb->bi_idl_cache_max_size ) {
-               bdb->bi_idl_tree = NULL;
-               ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
-               ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
-               bdb->bi_idl_cache_size = 0;
-       }
-
-#ifdef BDB_SUBDIRS
-       {
-               char dir[MAXPATHLEN], *ptr;
-               
-               if (bdb->bi_dbenv_home[0] == '.') {
-                       /* If home is a relative path, relative subdirs
-                        * are just concat'd by BDB. We don't want the
-                        * path to be concat'd twice, e.g.
-                        * ./test-db/./test-db/tmp
-                        */
-                       ptr = dir;
-               } else {
-                       ptr = lutil_strcopy( dir, bdb->bi_dbenv_home );
-                       *ptr++ = LDAP_DIRSEP[0];
-#ifdef HAVE_EBCDIC
-                       __atoe( dir );
-#endif
-               }
+       bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
 
-               strcpy( ptr, BDB_TMP_SUBDIR );
-#ifdef HAVE_EBCDIC
-               __atoe( ptr );
-#endif
-               rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
+       if( bdb->bi_dbenv_xflags != 0 ) {
+               rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
+                       bdb->bi_dbenv_xflags, 1);
                if( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
-                               dir, db_strerror(rc), rc );
-                       return rc;
+                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+                               db_strerror(rc), rc, 0 );
+                       goto fail;
                }
+       }
 
-               strcpy( ptr, BDB_LG_SUBDIR );
-#ifdef HAVE_EBCDIC
-               __atoe( ptr );
-#endif
-               rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
-                               dir, db_strerror(rc), rc );
-                       return rc;
-               }
+#define        BDB_TXN_FLAGS   (DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN)
 
-               strcpy( ptr, BDB_DATA_SUBDIR );
 #ifdef HAVE_EBCDIC
-               __atoe( ptr );
-#endif
-               rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
-                               dir, db_strerror(rc), rc );
-                       return rc;
-               }
-       }
+       strcpy( path, bdb->bi_dbenv_home );
+       __atoe( path );
+       dbhome = path;
+#else
+       dbhome = bdb->bi_dbenv_home;
 #endif
 
        Debug( LDAP_DEBUG_TRACE,
                "bdb_db_open: dbenv_open(%s)\n",
                bdb->bi_dbenv_home, 0, 0);
 
-#ifdef HAVE_EBCDIC
-       strcpy( path, bdb->bi_dbenv_home );
-       __atoe( path );
-       rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
-               path,
-               flags,
-               bdb->bi_dbenv_mode );
-#else
-       rc = bdb->bi_dbenv->open( bdb->bi_dbenv,
-               bdb->bi_dbenv_home,
-               flags,
-               bdb->bi_dbenv_mode );
-#endif
-       if( rc != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                       "bdb_db_open: dbenv_open failed: %s (%d)\n",
-                       db_strerror(rc), rc, 0 );
-               return rc;
+       /* Check if there is a usable existing environment */
+       flags = DB_JOINENV | DB_THREAD;
+
+       rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
+               flags, bdb->bi_dbenv_mode );
+       if( rc == 0 ) {
+               int flags_ok = 0;
+
+               got_env = 1;
+
+               rc = bdb->bi_dbenv->get_open_flags( bdb->bi_dbenv, &flags );
+               if ( rc == 0 ) {
+                       int flag2 = flags & BDB_TXN_FLAGS;
+
+                       /* In quick mode, none of these flags are allowed */
+                       if ( slapMode & SLAP_TOOL_QUICK ) {
+                               if ( !flag2 )
+                                       flags_ok = 1;
+                       } else {
+                       /* In normal mode, all of these flags are required */
+                               if ( flag2 == BDB_TXN_FLAGS )
+                                       flags_ok = 1;
+                       }
+               }
+
+               /* In Quick mode, we cannot Recover... */
+               if ( slapMode & SLAP_TOOL_QUICK ) {
+                       /* If we need to recover but we had no TXNs, just fail */
+                       if ( do_recover && flags_ok ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "bdb_db_open: Database cannot be recovered. "
+                                       "Restore from backup!\n", 0, 0, 0);
+                               rc = -1;
+                               goto fail;
+                       }
+                       /* We need to recover, and we had TXN support before:
+                        * Close this env, open a new one with recovery flags.
+                        */
+                       if ( do_recover ) {
+                               bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+                               bdb->bi_dbenv = NULL;
+                               rc = db_env_create( &bdb->bi_dbenv, 0 );
+                               if( rc != 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "bdb_db_open: db_env_create failed: %s (%d)\n",
+                                               db_strerror(rc), rc, 0 );
+                                       goto fail;
+                               }
+                               bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv,
+                                       be->be_suffix[0].bv_val );
+                               bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
+                               rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
+                                       flags | DB_RECOVER, bdb->bi_dbenv_mode );
+                               if( rc != 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "bdb_db_open: recovery failed: %s (%d)\n",
+                                               db_strerror(rc), rc, 0 );
+                                       goto fail;
+                               }
+                               do_recover = 0;
+                       }
+                       /* Prev environment had TXN support, get rid of it */
+                       if ( !flags_ok ) {
+                               bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+                               bdb->bi_dbenv = NULL;
+                               rc = db_env_create( &bdb->bi_dbenv, 0 );
+                               if( rc != 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "bdb_db_open: db_env_create failed: %s (%d)\n",
+                                               db_strerror(rc), rc, 0 );
+                                       goto fail;
+                               }
+                               bdb->bi_dbenv->remove( bdb->bi_dbenv, dbhome, 0 );
+                               bdb->bi_dbenv = NULL;
+                       }
+               /* Normal TXN mode */
+               } else {
+                       /* If we need to recover but we had no TXNs, just fail */
+                       if ( do_recover && !flags_ok ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "bdb_db_open: Database cannot be recovered. "
+                                       "Restore from backup!\n", 0, 0, 0);
+                               rc = -1;
+                               goto fail;
+                       }
+                       /* Prev environment had no TXN support, close it */
+                       if ( !flags_ok ) {
+                               bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+                               bdb->bi_dbenv = NULL;
+                               do_recover = 1;
+                       }
+               }
+
+               if ( flags_ok && !do_recover ) {
+                       /* This environment is fine, don't reopen it */
+                       open_env = 0;
+               } else {
+                       /* Create a new env that can take the desired settings */
+                       if ( bdb->bi_dbenv != NULL ) {
+                               bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
+                               bdb->bi_dbenv = NULL;
+                       }
+                       rc = db_env_create( &bdb->bi_dbenv, 0 );
+                       if( rc != 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "bdb_db_open: db_env_create failed: %s (%d)\n",
+                                       db_strerror(rc), rc, 0 );
+                               goto fail;
+                       }
+
+                       bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
+                       bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
+                       bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
+
+                       /* One long-lived TXN per thread, two TXNs per write op */
+                       bdb->bi_dbenv->set_tx_max( bdb->bi_dbenv, connection_pool_max * 3 );
+
+                       if( bdb->bi_dbenv_xflags != 0 ) {
+                               rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
+                                       bdb->bi_dbenv_xflags, 1);
+                               if( rc != 0 ) {
+                                       Debug( LDAP_DEBUG_ANY,
+                                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+                                               db_strerror(rc), rc, 0 );
+                                       goto fail;
+                               }
+                       }
+               }
        }
 
-       if( bdb->bi_dbenv_xflags != 0 ) {
-               rc = bdb->bi_dbenv->set_flags( bdb->bi_dbenv,
-                       bdb->bi_dbenv_xflags, 1);
+       /* If we need to recover but there was no existing environment,
+        * then we assume that someone has already manually recovered using
+        * db_recover. Just ignore it.
+        */
+       if ( do_recover && !got_env ) {
+               do_recover = 0;
+               Debug( LDAP_DEBUG_TRACE,
+                       "bdb_db_open: Recovery needed but environment is missing - "
+                       "assuming recovery was done manually...\n", 0, 0, 0 );
+       }
+
+       if ( open_env ) {
+               flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE;
+               if ( !( slapMode & SLAP_TOOL_QUICK ))
+                       flags |= BDB_TXN_FLAGS;
+
+               if ( do_recover )
+                       flags |= DB_RECOVER;
+
+               /* If a key was set, use shared memory for the BDB environment */
+               if ( bdb->bi_shm_key ) {
+                       bdb->bi_dbenv->set_shm_key( bdb->bi_dbenv, bdb->bi_shm_key );
+                       flags |= DB_SYSTEM_MEM;
+               }
+
+               rc = bdb->bi_dbenv->open( bdb->bi_dbenv, dbhome,
+                       flags, bdb->bi_dbenv_mode );
                if( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
+                               "bdb_db_open: dbenv_open failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
-                       return rc;
+                       goto fail;
                }
        }
 
+       if ( do_alock_recover && alock_recover (&bdb->bi_alock_info) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_open: alock_recover failed\n",
+                       0, 0, 0 );
+               rc = -1;
+               goto fail;
+       }
+
+#ifdef SLAP_ZONE_ALLOC
+       if ( bdb->bi_cache.c_maxsize ) {
+               bdb->bi_cache.c_zctx = slap_zn_mem_create(
+                                                               SLAP_ZONE_INITSIZE,
+                                                               SLAP_ZONE_MAXSIZE,
+                                                               SLAP_ZONE_DELTA,
+                                                               SLAP_ZONE_SIZE);
+       }
+#endif
+
+       if ( bdb->bi_idl_cache_max_size ) {
+               bdb->bi_idl_tree = NULL;
+               bdb->bi_idl_cache_size = 0;
+       }
+
        flags = DB_THREAD | bdb->bi_db_opflags;
 
+#ifdef DB_AUTO_COMMIT
+       if ( !( slapMode & SLAP_TOOL_QUICK ))
+               flags |= DB_AUTO_COMMIT;
+#endif
+
        bdb->bi_databases = (struct bdb_db_info **) ch_malloc(
                BDB_INDICES * sizeof(struct bdb_db_info *) );
 
@@ -294,12 +429,14 @@ bdb_db_open( BackendDB *be )
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_create(%s) failed: %s (%d)\n",
                                bdb->bi_dbenv_home, db_strerror(rc), rc );
-                       return rc;
+                       goto fail;
                }
 
                if( i == BDB_ID2ENTRY ) {
-                       rc = db->bdi_db->set_bt_compare( db->bdi_db,
-                               bdb_bt_compare );
+                       if ( slapMode & SLAP_TOOL_MODE )
+                               db->bdi_db->mpf->set_priority( db->bdi_db->mpf,
+                                       DB_PRIORITY_VERY_LOW );
+
                        rc = db->bdi_db->set_pagesize( db->bdi_db,
                                BDB_ID2ENTRY_PAGESIZE );
                        if ( slapMode & SLAP_TOOL_READMAIN ) {
@@ -311,18 +448,12 @@ bdb_db_open( BackendDB *be )
                        rc = db->bdi_db->set_flags( db->bdi_db, 
                                DB_DUP | DB_DUPSORT );
 #ifndef BDB_HIER
-                       rc = db->bdi_db->set_dup_compare( db->bdi_db,
-                               bdb_bt_compare );
                        if ( slapMode & SLAP_TOOL_READONLY ) {
                                flags |= DB_RDONLY;
                        } else {
                                flags |= DB_CREATE;
                        }
 #else
-                       rc = db->bdi_db->set_dup_compare( db->bdi_db,
-                               bdb_dup_compare );
-                       rc = db->bdi_db->set_bt_compare( db->bdi_db,
-                               bdb_bt_compare );
                        if ( slapMode & (SLAP_TOOL_READONLY|SLAP_TOOL_READMAIN) ) {
                                flags |= DB_RDONLY;
                        } else {
@@ -351,11 +482,16 @@ bdb_db_open( BackendDB *be )
                        bdb->bi_dbenv_mode );
 #endif
 
-               if( rc != 0 ) {
+               if ( rc != 0 ) {
+                       char    buf[SLAP_TEXT_BUFLEN];
+
+                       snprintf( buf, sizeof(buf), "%s/%s", 
+                               bdb->bi_dbenv_home, bdbi_databases[i].file );
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_open(%s) failed: %s (%d)\n",
-                               bdb->bi_dbenv_home, db_strerror(rc), rc );
-                       return rc;
+                               buf, db_strerror(rc), rc );
+                       db->bdi_db->close( db->bdi_db, 0 );
+                       goto fail;
                }
 
                flags &= ~(DB_CREATE | DB_RDONLY);
@@ -372,13 +508,20 @@ bdb_db_open( BackendDB *be )
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: last_id(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
-               return rc;
+               goto fail;
+       }
+
+       if ( !( slapMode & SLAP_TOOL_QUICK )) {
+               XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
        }
 
-       XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
+       bdb->bi_flags |= BDB_IS_OPEN;
 
-       /* <insert> open (and create) index databases */
        return 0;
+
+fail:
+       bdb_db_close( be );
+       return rc;
 }
 
 static int
@@ -389,7 +532,12 @@ bdb_db_close( BackendDB *be )
        struct bdb_db_info *db;
        bdb_idl_cache_entry_t *entry, *next_entry;
 
-       while( bdb->bi_ndatabases-- ) {
+       bdb->bi_flags &= ~BDB_IS_OPEN;
+
+       ber_bvarray_free( bdb->bi_db_config );
+       bdb->bi_db_config = NULL;
+
+       while( bdb->bi_databases && bdb->bi_ndatabases-- ) {
                db = bdb->bi_databases[bdb->bi_ndatabases];
                rc = db->bdi_db->close( db->bdi_db, 0 );
                /* Lower numbered names are not strdup'd */
@@ -398,13 +546,13 @@ bdb_db_close( BackendDB *be )
                free( db );
        }
        free( bdb->bi_databases );
-       bdb_attr_index_destroy( bdb->bi_attrs );
+       bdb->bi_databases = NULL;
 
        bdb_cache_release_all (&bdb->bi_cache);
 
        if ( bdb->bi_idl_cache_max_size ) {
-               ldap_pvt_thread_rdwr_wlock ( &bdb->bi_idl_tree_rwlock );
                avl_free( bdb->bi_idl_tree, NULL );
+               bdb->bi_idl_tree = NULL;
                entry = bdb->bi_idl_lru_head;
                while ( entry != NULL ) {
                        next_entry = entry->idl_lru_next;
@@ -414,71 +562,70 @@ bdb_db_close( BackendDB *be )
                        free( entry );
                        entry = next_entry;
                }
-               ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
+               bdb->bi_idl_lru_head = bdb->bi_idl_lru_tail = NULL;
        }
 
-       XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
-
-       return 0;
-}
-
-static int
-bdb_db_destroy( BackendDB *be )
-{
-       int rc;
-       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
-       Operation *ps = NULL;
-       Operation *psn = NULL;
-
        /* close db environment */
        if( bdb->bi_dbenv ) {
-               /* force a checkpoint */
-               rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
-               if( rc != 0 ) {
-                       Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
-                               db_strerror(rc), rc, 0 );
+               /* Free cache locker if we enabled locking */
+               if ( !( slapMode & SLAP_TOOL_QUICK )) {
+                       XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
+                       bdb->bi_cache.c_locker = 0;
+               }
+
+               /* force a checkpoint, but not if we were ReadOnly,
+                * and not in Quick mode since there are no transactions there.
+                */
+               if ( !( slapMode & ( SLAP_TOOL_QUICK|SLAP_TOOL_READONLY ))) {
+                       rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
+                       if( rc != 0 ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       "bdb_db_close: txn_checkpoint failed: %s (%d)\n",
+                                       db_strerror(rc), rc, 0 );
+                       }
                }
 
                rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
                bdb->bi_dbenv = NULL;
                if( rc != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_db_destroy: close failed: %s (%d)\n",
+                               "bdb_db_close: close failed: %s (%d)\n",
                                db_strerror(rc), rc, 0 );
                        return rc;
                }
        }
 
+       rc = alock_close( &bdb->bi_alock_info );
+       if( rc != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "bdb_db_close: alock_close failed\n", 0, 0, 0 );
+               return -1;
+       }
+
+       return 0;
+}
+
+static int
+bdb_db_destroy( BackendDB *be )
+{
+       struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+
        if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
+       if( bdb->bi_db_config_path ) ch_free( bdb->bi_db_config_path );
+
+       bdb_attr_index_destroy( bdb );
 
        ldap_pvt_thread_rdwr_destroy ( &bdb->bi_cache.c_rwlock );
-       ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_mutex );
+       ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_head_mutex );
+       ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_tail_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.c_dntree.bei_kids_mutex );
-       ldap_pvt_thread_rdwr_destroy ( &bdb->bi_pslist_rwlock );
+#ifdef BDB_HIER
+       ldap_pvt_thread_mutex_destroy( &bdb->bi_modrdns_mutex );
+#endif
        ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
-       if ( bdb->bi_idl_cache_max_size ) {
-               ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
-               ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
-       }
-
-       ps = LDAP_LIST_FIRST( &bdb->bi_psearch_list );
-
-       if ( ps ) {
-               psn = LDAP_LIST_NEXT( ps, o_ps_link );
-               slap_op_free( ps );
-               if ( ps->o_tmpmemctx )
-                       slap_sl_mem_destroy( NULL, ps->o_tmpmemctx );
-       }
-
-       while ( psn ) {
-               ps = psn;
-               psn = LDAP_LIST_NEXT( ps, o_ps_link );
-               slap_op_free( ps );
-               if ( ps->o_tmpmemctx )
-                       slap_sl_mem_destroy( NULL, ps->o_tmpmemctx );
-       }
+       ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
+       ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
 
        ch_free( bdb );
        be->be_private = NULL;
@@ -486,58 +633,37 @@ bdb_db_destroy( BackendDB *be )
        return 0;
 }
 
-#if    (SLAPD_BDB == SLAPD_MOD_DYNAMIC && !defined(BDB_HIER)) || \
-       (SLAPD_HDB == SLAPD_MOD_DYNAMIC && defined(BDB_HIER))
-int init_module( int argc, char *argv[] ) {
-       BackendInfo bi;
-
-       memset( &bi, '\0', sizeof(bi) );
-#ifdef BDB_HIER
-       bi.bi_type = "hdb";
-#else
-       bi.bi_type = "bdb";
-#endif
-       bi.bi_init = bdb_initialize;
-
-       backend_add( &bi );
-       return 0;
-}
-#endif /* SLAPD_BDB */
-
 int
-bdb_initialize(
+bdb_back_initialize(
        BackendInfo     *bi )
 {
+       int rc;
+
        static char *controls[] = {
                LDAP_CONTROL_ASSERT,
                LDAP_CONTROL_MANAGEDSAIT,
                LDAP_CONTROL_NOOP,
                LDAP_CONTROL_PAGEDRESULTS,
-#ifdef LDAP_CONTROL_SUBENTRIES
                LDAP_CONTROL_SUBENTRIES,
-#endif
-               LDAP_CONTROL_VALUESRETURNFILTER,
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
                NULL
        };
 
        /* initialize the underlying database system */
-       Debug( LDAP_DEBUG_TRACE, "bdb_initialize: initialize BDB backend\n",
-               0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE,
+               LDAP_XSTRING(bdb_back_initialize) ": initialize " 
+               BDB_UCTYPE " backend\n", 0, 0, 0 );
 
        bi->bi_flags |=
                SLAP_BFLAG_INCREMENT |
-#ifdef BDB_SUBENTRIES
                SLAP_BFLAG_SUBENTRIES |
-#endif
-#ifdef BDB_ALIASES
                SLAP_BFLAG_ALIASES |
-#endif
                SLAP_BFLAG_REFERRALS;
 
        bi->bi_controls = controls;
 
        {       /* version check */
-               int major, minor, patch;
+               int major, minor, patch, ver;
                char *version = db_version( &major, &minor, &patch );
 #ifdef HAVE_EBCDIC
                char v2[1024];
@@ -551,18 +677,19 @@ bdb_initialize(
                version = v2;
 #endif
 
-               if( major != DB_VERSION_MAJOR ||
-                       minor != DB_VERSION_MINOR ||
-                       patch < DB_VERSION_PATCH )
-               {
+               ver = (major << 24) | (minor << 16) | patch;
+               if( ver != DB_VERSION_FULL ) {
+                       /* fail if a versions don't match */
                        Debug( LDAP_DEBUG_ANY,
-                               "bdb_initialize: BDB library version mismatch:"
+                               LDAP_XSTRING(bdb_back_initialize) ": "
+                               "BDB library version mismatch:"
                                " expected " DB_VERSION_STRING ","
                                " got %s\n", version, 0, 0 );
+                       return -1;
                }
 
-               Debug( LDAP_DEBUG_ANY, "bdb_initialize: %s\n",
-                       version, 0, 0 );
+               Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_back_initialize)
+                       ": %s\n", version, 0, 0 );
        }
 
        db_env_set_func_free( ber_memfree );
@@ -575,20 +702,13 @@ bdb_initialize(
        db_env_set_func_yield( ldap_pvt_thread_yield );
 #endif
 
-       {
-               static char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
-
-               bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
-               bdb_uuid.bv_val = uuidbuf;
-       }
-
        bi->bi_open = 0;
        bi->bi_close = 0;
        bi->bi_config = 0;
        bi->bi_destroy = 0;
 
        bi->bi_db_init = bdb_db_init;
-       bi->bi_db_config = bdb_db_config;
+       bi->bi_db_config = config_generic_wrapper;
        bi->bi_db_open = bdb_db_open;
        bi->bi_db_close = bdb_db_close;
        bi->bi_db_destroy = bdb_db_destroy;
@@ -603,9 +723,6 @@ bdb_initialize(
 
        bi->bi_op_unbind = 0;
 
-       bi->bi_op_abandon = bdb_abandon;
-       bi->bi_op_cancel = bdb_cancel;
-
        bi->bi_extended = bdb_extended;
 
        bi->bi_chk_referrals = bdb_referrals;
@@ -632,5 +749,20 @@ bdb_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       return 0;
+       rc = bdb_back_init_cf( bi );
+
+       return rc;
 }
+
+#if    (SLAPD_BDB == SLAPD_MOD_DYNAMIC && !defined(BDB_HIER)) || \
+       (SLAPD_HDB == SLAPD_MOD_DYNAMIC && defined(BDB_HIER))
+
+/* conditionally define the init_module() function */
+#ifdef BDB_HIER
+SLAP_BACKEND_INIT_MODULE( hdb )
+#else /* !BDB_HIER */
+SLAP_BACKEND_INIT_MODULE( bdb )
+#endif /* !BDB_HIER */
+
+#endif /* SLAPD_[BH]DB == SLAPD_MOD_DYNAMIC */
+