Add calls to module_init/module_kill to support dynamically loaded backends.

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 0a366fd2b7df8221948824619e4dd7a9b591d235..afc3e97ee62d24d404acfeccaf54445c2057ad24 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -34,6 +34,9 @@ static struct bdbi_database {
 
 struct berval bdb_uuid = { 0, NULL };
 
+typedef void * db_malloc(size_t);
+typedef void * db_realloc(void *, size_t);
+
 static int
 bdb_open( BackendInfo *bi )
 {
@@ -61,7 +64,7 @@ bdb_db_init( BackendDB *be )
        struct bdb_info *bdb;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "init", LDAP_LEVEL_ENTRY, "bdb_db_init" ));
+       LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_init", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "bdb_db_init: Initializing BDB database\n",
@@ -126,7 +129,8 @@ static void *lock_detect_task( void *arg )
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_init: aborted %d locks\n", aborted ));
+               LDAP_LOG( BACK_BDB, ERR, "bdb_db_init: aborted %d locks\n", 
+                       aborted, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_lock_detect: aborted %d locks\n",
@@ -169,21 +173,31 @@ bdb_db_open( BackendDB *be )
        int rc, i;
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        u_int32_t flags;
+#ifdef HAVE_EBCDIC
+       char path[MAXPATHLEN];
+#endif
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "init", LDAP_LEVEL_ARGS, "bdb_db_open: %s\n", be->be_suffix[0].bv_val ));
+       LDAP_LOG( BACK_BDB, ARGS, 
+               "bdb_db_open: %s\n", be->be_suffix[0].bv_val, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS,
                "bdb_db_open: %s\n",
                be->be_suffix[0].bv_val, 0, 0 );
 #endif
 
+       db_env_set_func_free( ber_memfree );
+       db_env_set_func_malloc( ber_memalloc );
+       db_env_set_func_realloc( ber_memrealloc );
+
        /* we should check existance of dbenv_home and db_directory */
 
        rc = db_env_create( &bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_env_create failed: %s (%d)\n", db_strerror(rc), rc ));
+               LDAP_LOG( BACK_BDB, ERR, 
+                       "bdb_db_open: db_env_create failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: db_env_create failed: %s (%d)\n",
@@ -193,7 +207,15 @@ bdb_db_open( BackendDB *be )
        }
 
        flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
-               | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;
+               | 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.
+        */
+       if( !(slapMode & SLAP_TOOL_MODE) ) flags |= DB_RECOVER;
+#endif
 
        bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
        bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
@@ -212,7 +234,9 @@ bdb_db_open( BackendDB *be )
                rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n", 
+                               dir, db_strerror(rc), rc );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_tmp_dir(%s) failed: %s (%d)\n",
@@ -226,7 +250,9 @@ bdb_db_open( BackendDB *be )
                rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n", 
+                               dir, db_strerror(rc), rc );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_lg_dir(%s) failed: %s (%d)\n",
@@ -240,7 +266,9 @@ bdb_db_open( BackendDB *be )
                rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n", dir, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
+                               dir, db_strerror(rc), rc );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: set_data_dir(%s) failed: %s (%d)\n",
@@ -252,20 +280,32 @@ bdb_db_open( BackendDB *be )
 #endif
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "init", LDAP_LEVEL_DETAIL1, "bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home ));
+       LDAP_LOG( BACK_BDB, DETAIL1, 
+               "bdb_db_open: dbenv_open %s\n", bdb->bi_dbenv_home, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE,
                "bdb_db_open: dbenv_open(%s)\n",
                bdb->bi_dbenv_home, 0, 0);
 #endif
 
+#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 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: dbenv_open failed: %s (%d)\n", db_strerror(rc), rc ));
+               LDAP_LOG( BACK_BDB, ERR, 
+                       "bdb_db_open: dbenv_open failed: %s (%d)\n", 
+                       db_strerror(rc), rc, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: dbenv_open failed: %s (%d)\n",
@@ -279,7 +319,9 @@ bdb_db_open( BackendDB *be )
                        bdb->bi_dbenv_xflags, 1);
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: dbenv_set_flags failed: %s (%d)\n", db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: dbenv_set_flags failed: %s (%d)\n", 
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: dbenv_set_flags failed: %s (%d)\n",
@@ -303,7 +345,9 @@ bdb_db_open( BackendDB *be )
                rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: db_create(%s) failed: %s (%d)\n", 
+                               bdb->bi_dbenv_home, db_strerror(rc), rc );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_create(%s) failed: %s (%d)\n",
@@ -321,7 +365,7 @@ bdb_db_open( BackendDB *be )
 #ifdef BDB_HIER
                        rc = db->bdi_db->set_bt_compare( db->bdi_db,
                                bdb_bt_compare );
-#elif defined(BDB_IDL_MULTI)
+#else
                        rc = db->bdi_db->set_flags( db->bdi_db, 
                                DB_DUP | DB_DUPSORT );
                        rc = db->bdi_db->set_dup_compare( db->bdi_db,
@@ -331,16 +375,29 @@ bdb_db_open( BackendDB *be )
                                BDB_PAGESIZE );
                }
 
-               rc = db->bdi_db->open( db->bdi_db,
+#ifdef HAVE_EBCDIC
+               strcpy( path, bdbi_databases[i].file );
+               __atoe( path );
+               rc = DB_OPEN( db->bdi_db, 
+                       path,
+               /*      bdbi_databases[i].name, */ NULL,
+                       bdbi_databases[i].type,
+                       bdbi_databases[i].flags | flags,
+                       bdb->bi_dbenv_mode );
+#else
+               rc = DB_OPEN( db->bdi_db, 
                        bdbi_databases[i].file,
                /*      bdbi_databases[i].name, */ NULL,
                        bdbi_databases[i].type,
                        bdbi_databases[i].flags | flags,
                        bdb->bi_dbenv_mode );
+#endif
 
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: db_create(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: db_create(%s) failed: %s (%d)\n", 
+                               bdb->bi_dbenv_home, db_strerror(rc), rc );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_open: db_open(%s) failed: %s (%d)\n",
@@ -360,7 +417,9 @@ bdb_db_open( BackendDB *be )
        rc = bdb_last_id( be, NULL );
        if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_open: last_id(%s) failed: %s (%d)\n", bdb->bi_dbenv_home, db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_open: last_id(%s) failed: %s (%d)\n", 
+                               bdb->bi_dbenv_home, db_strerror(rc), rc );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_open: last_id(%s) failed: %s (%d)\n",
@@ -419,7 +478,9 @@ bdb_db_destroy( BackendDB *be )
                rc = TXN_CHECKPOINT( bdb->bi_dbenv, 0, 0, DB_FORCE );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n", db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_destroy: txn_checkpoint failed: %s (%d)\n",
@@ -433,7 +494,9 @@ bdb_db_destroy( BackendDB *be )
                bdb->bi_dbenv = NULL;
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_destroy: close failed: %s (%d)\n", db_strerror(rc), rc ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_destroy: close failed: %s (%d)\n", 
+                               db_strerror(rc), rc, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_db_destroy: close failed: %s (%d)\n",
@@ -443,6 +506,8 @@ bdb_db_destroy( BackendDB *be )
                }
        }
 
+       if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
+
 #ifdef BDB_HIER
        ldap_pvt_thread_rdwr_destroy( &bdb->bi_tree_rdwr );
 #endif
@@ -451,6 +516,9 @@ bdb_db_destroy( BackendDB *be )
        ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
 
+       ch_free( bdb );
+       be->be_private = NULL;
+
        return 0;
 }
 
@@ -482,6 +550,9 @@ bdb_initialize(
 #endif
 #ifdef LDAP_CONTROL_VALUESRETURNFILTER
                LDAP_CONTROL_VALUESRETURNFILTER,
+#endif
+#ifdef LDAP_CLIENT_UPDATE
+               LDAP_CONTROL_CLIENT_UPDATE,
 #endif
                NULL
        };
@@ -490,7 +561,7 @@ bdb_initialize(
 
        /* initialize the underlying database system */
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "init", LDAP_LEVEL_ENTRY, "bdb_db_initialize\n" ));
+       LDAP_LOG( BACK_BDB, ENTRY, "bdb_db_initialize\n", 0, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "bdb_open: initialize BDB backend\n",
                0, 0, 0 );
@@ -499,13 +570,26 @@ bdb_initialize(
        {       /* version check */
                int major, minor, patch;
                char *version = db_version( &major, &minor, &patch );
+#ifdef HAVE_EBCDIC
+               char v2[1024];
+
+               /* All our stdio does an ASCII to EBCDIC conversion on
+                * the output. Strings from the BDB library are already
+                * in EBCDIC; we have to go back and forth...
+                */
+               strcpy( v2, version );
+               __etoa( v2 );
+               version = v2;
+#endif
 
                if( major != DB_VERSION_MAJOR ||
                        minor != DB_VERSION_MINOR ||
                        patch < DB_VERSION_PATCH )
                {
 #ifdef NEW_LOGGING
-                       LDAP_LOG(( "init", LDAP_LEVEL_ERR, "bdb_db_initialize: version mismatch: \texpected: %s \tgot: %s\n", DB_VERSION_STRING, version ));
+                       LDAP_LOG( BACK_BDB, ERR, 
+                               "bdb_db_initialize: version mismatch: "
+                               "\texpected: %s \tgot: %s\n", DB_VERSION_STRING, version, 0 );
 #else
                        Debug( LDAP_DEBUG_ANY,
                                "bdb_open: version mismatch\n"
@@ -515,7 +599,8 @@ bdb_initialize(
                }
 
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "init", LDAP_LEVEL_DETAIL1, "bdb_db_initialize: bdb_open: %s\n", version ));
+               LDAP_LOG( BACK_BDB, DETAIL1, 
+                       "bdb_db_initialize: bdb_open: %s\n", version, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "bdb_open: %s\n",
                        version, 0, 0 );
@@ -531,7 +616,7 @@ bdb_initialize(
        db_env_set_func_yield( ldap_pvt_thread_yield );
 
        {
-               static char uuidbuf[40];
+               static char uuidbuf[ LDAP_LUTIL_UUIDSTR_BUFSIZE ];
 
                bdb_uuid.bv_len = lutil_uuidstr( uuidbuf, sizeof( uuidbuf ));
                bdb_uuid.bv_val = uuidbuf;
@@ -561,7 +646,7 @@ bdb_initialize(
 
        bi->bi_extended = bdb_extended;
 
-#if 0
+#if 1
        /*
         * these routines (and their callers) are not yet designed
         * to work with transaction.  Using them may cause deadlock.