return structuralObjectClass errors

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 20826b2045fb070c1f5115349b01b1e7e1b99038..313430d3a55d29a178ac3f60830c8504d4732e10 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -81,11 +81,7 @@ bdb_db_init( BackendDB *be )
        be->be_private = bdb;
        be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
-#ifdef SLAPD_MONITOR
-       rc = bdb_monitor_init( be );
-#else
-       rc = 0;
-#endif
+       rc = bdb_monitor_db_init( be );
 
        return rc;
 }
@@ -429,13 +425,11 @@ bdb_db_open( BackendDB *be )
                XLOCK_ID(bdb->bi_dbenv, &bdb->bi_cache.c_locker);
        }
 
-#ifdef SLAPD_MONITOR
        /* monitor setup */
-       rc = bdb_monitor_open( be );
+       rc = bdb_monitor_db_open( be );
        if ( rc != 0 ) {
                goto fail;
        }
-#endif
 
        bdb->bi_flags |= BDB_IS_OPEN;
 
@@ -456,10 +450,8 @@ bdb_db_close( BackendDB *be )
        struct bdb_db_info *db;
        bdb_idl_cache_entry_t *entry, *next_entry;
 
-#ifdef SLAPD_MONITOR
        /* monitor handling */
-       (void)bdb_monitor_close( be );
-#endif
+       (void)bdb_monitor_db_close( be );
 
        bdb->bi_flags &= ~BDB_IS_OPEN;
 
@@ -539,6 +531,9 @@ bdb_db_destroy( BackendDB *be )
 {
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 
+       /* monitor handling */
+       (void)bdb_monitor_db_close( be );
+
        if( bdb->bi_dbenv_home ) ch_free( bdb->bi_dbenv_home );
        if( bdb->bi_db_config_path ) ch_free( bdb->bi_db_config_path );
 
@@ -683,16 +678,6 @@ bdb_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-#ifdef SLAPD_MONITOR
-       /*
-        * initialize monitor stuff
-        */
-       rc = bdb_monitor_initialize();
-       if ( rc ) {
-               return rc;
-       }
-#endif
-
        rc = bdb_back_init_cf( bi );
 
        return rc;