Change 'unsigned long len' to ber_len_t in get_filter()

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

diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c
index eaa557f9deacde44c7a5c598322b5c3fc89e54f2..593405061b3754db9ae3928eda754bceba69b392 100644 (file)
--- a/servers/slapd/back-bdb2/init.c
+++ b/servers/slapd/back-bdb2/init.c
@@ -10,6 +10,19 @@
 #include "slap.h"
 #include "back-bdb2.h"
 
+#ifdef SLAPD_BDB2_DYNAMIC
+#include <gmodule.h>
+
+G_MODULE_EXPORT void init_module(int argc, char *argv[]) {
+   BackendInfo bi;
+
+   bi.bi_type = "bdb2";
+   bi.bi_init = bdb2_back_initialize;
+
+   backend_add(&bi);
+}
+
+#endif /* SLAPD_BDB2_DYNAMIC */
 
 static int
 bdb2i_back_init_private(
@@ -23,7 +36,6 @@ bdb2i_back_init_private(
 
        bt->lty_dbhome = DEFAULT_DB_HOME;
        bt->lty_mpsize = DEFAULT_DBCACHE_SIZE;
-       bt->lty_dbenv  = &ldbm_Env;
 
        if ( slapMode == SLAP_TIMEDSERVER_MODE )
                bt->lty_betiming = 1;
@@ -62,9 +74,11 @@ bdb2_back_initialize(
        bi->bi_op_delete = bdb2_back_delete;
        bi->bi_op_abandon = bdb2_back_abandon;
 
-#ifdef SLAPD_ACLGROUPS
+       bi->bi_entry_release_rw = bdb2_back_entry_release_rw;
        bi->bi_acl_group = bdb2_back_group;
-#endif
+
+       bi->bi_connection_init = 0;
+       bi->bi_connection_destroy = 0;
 
        ret = bdb2i_back_init_private( bi );
 
@@ -124,15 +138,14 @@ bdb2i_back_db_init_internal(
 {
        struct ldbminfo *li;
        char            *argv[ 4 ];
-       int             i;
 
        /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
 
        /* arrange to read nextid later (on first request for it) */
        li->li_nextid = NOID;
-#if    SLAPD_NEXTID_CHUNCK > 1
-       li->li_nextid_wrote = NOID
+#if    SLAPD_NEXTID_CHUNK > 1
+       li->li_nextid_wrote = NOID;
 #endif
 
        /* default cache size */
@@ -151,34 +164,30 @@ bdb2i_back_db_init_internal(
        li->li_directory = DEFAULT_DB_DIRECTORY;
 
        /* always index dn, id2children, objectclass (used in some searches) */
+       if ( !at_find( "dn" ) ) {
+               argv[ 0 ] = "dn";
+               argv[ 1 ] = "dn";
+               argv[ 2 ] = NULL;
+               attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
+       }
        argv[ 0 ] = "dn";
-       argv[ 1 ] = "dn";
+       argv[ 1 ] = "eq,sub";
        argv[ 2 ] = NULL;
-       attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
-       argv[ 0 ] = "dn";
-       argv[ 1 ] = "sub";
-       argv[ 2 ] = "eq";
-       argv[ 3 ] = NULL;
-       bdb2i_attr_index_config( li, "ldbm dn initialization", 0, 3, argv, 1 );
+       bdb2i_attr_index_config( li, "ldbm dn initialization", 0, 2, argv, 1 );
        argv[ 0 ] = "id2children";
        argv[ 1 ] = "eq";
        argv[ 2 ] = NULL;
        bdb2i_attr_index_config( li, "ldbm id2children initialization", 0, 2, argv,
            1 );
        argv[ 0 ] = "objectclass";
-       argv[ 1 ] = ch_strdup( "pres,eq" );
+       argv[ 1 ] = "pres,eq";
        argv[ 2 ] = NULL;
        bdb2i_attr_index_config( li, "ldbm objectclass initialization", 0, 2, argv,
            1 );
        free( argv[ 1 ] );
 
-       /* initialize various mutex locks & condition variables */
-       ldap_pvt_thread_mutex_init( &li->li_root_mutex );
-       ldap_pvt_thread_mutex_init( &li->li_add_mutex );
+       /*  initialize the cache mutex */
        ldap_pvt_thread_mutex_init( &li->li_cache.c_mutex );
-       ldap_pvt_thread_mutex_init( &li->li_nextid_mutex );
-       ldap_pvt_thread_mutex_init( &li->li_dbcache_mutex );
-       ldap_pvt_thread_cond_init( &li->li_dbcache_cv );
 
        /*  initialize the TP file head  */
        if ( bdb2i_txn_head_init( &li->li_txn_head ) != 0 )