Fix ITS#3255, boi_bdb comparisons

[openldap] / servers / slapd / back-bdb / init.c

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 63685bc635b105fa4303d46ab958fc68f38577bd..e9f616c602f76059a5717aa1521d4d21fbed77ed 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -36,7 +36,7 @@ static const struct bdbi_database {
        { NULL, NULL, 0, 0 }
 };
 
-struct berval bdb_uuid = { 0, NULL };
+struct berval bdb_uuid = BER_BVNULL;
 
 typedef void * db_malloc(size_t);
 typedef void * db_realloc(void *, size_t);
@@ -71,20 +71,9 @@ bdb_db_init( BackendDB *be )
        LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
-               "bdb_db_init: Initializing BDB database\n",
-               0, 0, 0 );
-#endif
-
-       /* indicate system schema supported */
-       be->be_flags |=
-               SLAP_BFLAG_INCREMENT |
-#ifdef BDB_SUBENTRIES
-               SLAP_BFLAG_SUBENTRIES |
-#endif
-#ifdef BDB_ALIASES
-               SLAP_BFLAG_ALIASES |
+               "bdb_db_init: Initializing %s database\n",
+               be->bd_info->bi_type, 0, 0 );
 #endif
-               SLAP_BFLAG_REFERRALS;
 
        /* allocate backend-database-specific stuff */
        bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
@@ -118,8 +107,7 @@ int
 bdb_bt_compare(
        DB *db, 
        const DBT *usrkey,
-       const DBT *curkey
-)
+       const DBT *curkey )
 {
        unsigned char *u, *c;
        int i, x;
@@ -208,6 +196,9 @@ bdb_db_open( BackendDB *be )
        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_idl_cache_max_size ) {
                bdb->bi_idl_tree = NULL;
                ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
@@ -457,6 +448,8 @@ bdb_db_open( BackendDB *be )
                return rc;
        }
 
+       XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
+
        /* <insert> open (and create) index databases */
        return 0;
 }
@@ -497,6 +490,8 @@ bdb_db_close( BackendDB *be )
                ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
        }
 
+       XLOCK_ID_FREE(bdb->bi_dbenv, bdb->bi_cache.c_locker);
+
        return 0;
 }
 
@@ -546,7 +541,6 @@ bdb_db_destroy( BackendDB *be )
        ldap_pvt_thread_rdwr_destroy ( &bdb->bi_pslist_rwlock );
        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 );
@@ -558,8 +552,8 @@ bdb_db_destroy( BackendDB *be )
        return 0;
 }
 
-#if    (defined(SLAPD_BDB_DYNAMIC) && !defined(BDB_HIER)) || \
-       (defined(SLAPD_HDB_DYNAMIC) && defined(BDB_HIER))
+#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;
 
@@ -574,12 +568,11 @@ int init_module( int argc, char *argv[] ) {
        backend_add( &bi );
        return 0;
 }
-#endif /* SLAPD_BDB_DYNAMIC */
+#endif /* SLAPD_BDB */
 
 int
 bdb_initialize(
-       BackendInfo     *bi
-)
+       BackendInfo     *bi )
 {
        static char *controls[] = {
                LDAP_CONTROL_ASSERT,
@@ -593,8 +586,6 @@ bdb_initialize(
                NULL
        };
 
-       bi->bi_controls = controls;
-
        /* initialize the underlying database system */
 #ifdef NEW_LOGGING
        LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
@@ -603,6 +594,18 @@ bdb_initialize(
                0, 0, 0 );
 #endif
 
+       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;
                char *version = db_version( &major, &minor, &patch );