minor cleanup

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index d4d8b4e9a32f9cd175f56c3171a2c7992cbafeac..313430d3a55d29a178ac3f60830c8504d4732e10 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -81,7 +81,7 @@ bdb_db_init( BackendDB *be )
        be->be_private = bdb;
        be->be_cf_ocs = be->bd_info->bi_cf_ocs;
 
-       rc = bdb_monitor_init( be );
+       rc = bdb_monitor_db_init( be );
 
        return rc;
 }
@@ -426,7 +426,7 @@ bdb_db_open( BackendDB *be )
        }
 
        /* monitor setup */
-       rc = bdb_monitor_open( be );
+       rc = bdb_monitor_db_open( be );
        if ( rc != 0 ) {
                goto fail;
        }
@@ -451,7 +451,7 @@ bdb_db_close( BackendDB *be )
        bdb_idl_cache_entry_t *entry, *next_entry;
 
        /* monitor handling */
-       (void)bdb_monitor_close( be );
+       (void)bdb_monitor_db_close( be );
 
        bdb->bi_flags &= ~BDB_IS_OPEN;
 
@@ -531,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 );
 

diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c
index 7607618f615ef4b3e40eb9695a41908ed296966f..8565435210d38b30bce85b252cac8ab3325f50d6 100644 (file)
--- a/servers/slapd/back-bdb/monitor.c
+++ b/servers/slapd/back-bdb/monitor.c
@@ -173,6 +173,8 @@ bdb_monitor_free(
 
        int             i, rc;
 
+       /* NOTE: if slap_shutdown != 0, priv might have already been freed */
+
        /* Remove objectClass */
        mod.sm_op = LDAP_MOD_DELETE;
        mod.sm_desc = slap_schema.si_ad_objectClass;
@@ -199,24 +201,23 @@ bdb_monitor_free(
 /*
  * call from within bdb_initialize()
  */
-int
+static int
 bdb_monitor_initialize( void )
 {
        int             i, code;
-       BackendInfo *bi;
 
        static int      bdb_monitor_initialized = 0;
 
-       bi = backend_info("monitor");
-       if ( !bi )
+       if ( backend_info( "monitor" ) == NULL ) {
                return -1;
-
-       /* register schema here */
+       }
 
        if ( bdb_monitor_initialized++ ) {
                return 0;
        }
 
+       /* register schema here */
+
        for ( i = 0; s_oid[ i ].name; i++ ) {
                char    *argv[ 3 ];
        
@@ -258,9 +259,10 @@ bdb_monitor_initialize( void )
  * call from within bdb_db_init()
  */
 int
-bdb_monitor_init( BackendDB *be )
+bdb_monitor_db_init( BackendDB *be )
 {
        if ( bdb_monitor_initialize() == LDAP_SUCCESS ) {
+               /* monitoring in back-bdb is on by default */
                SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING;
        }
 
@@ -271,7 +273,7 @@ bdb_monitor_init( BackendDB *be )
  * call from within bdb_db_open()
  */
 int
-bdb_monitor_open( BackendDB *be )
+bdb_monitor_db_open( BackendDB *be )
 {
        struct bdb_info         *bdb = (struct bdb_info *) be->be_private;
        Attribute               *a, *next;
@@ -279,20 +281,19 @@ bdb_monitor_open( BackendDB *be )
        struct berval           suffix, *filter, *base;
        char                    *ptr;
        int                     rc = 0;
-       monitor_extra_t *mbe;
+       BackendInfo             *mi;
+       monitor_extra_t         *mbe;
 
        if ( !SLAP_DBMONITORING( be ) ) {
                return 0;
        }
 
-       {
-               BackendInfo *mi = backend_info( "monitor" );
-               if ( !mi || !mi->bi_extra ) {
-                       SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING;
-                       return 0;
-               }
-               mbe = mi->bi_extra;
+       mi = backend_info( "monitor" );
+       if ( !mi || !mi->bi_extra ) {
+               SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING;
+               return 0;
        }
+       mbe = mi->bi_extra;
 
        /* don't bother if monitor is not configured */
        if ( !mbe->is_configured() ) {
@@ -422,7 +423,9 @@ bdb_monitor_open( BackendDB *be )
 
        cb = ch_calloc( sizeof( monitor_callback_t ), 1 );
        cb->mc_update = bdb_monitor_update;
+#if 0  /* uncomment if required */
        cb->mc_modify = bdb_monitor_modify;
+#endif
        cb->mc_free = bdb_monitor_free;
        cb->mc_private = (void *)bdb;
 
@@ -463,22 +466,22 @@ cleanup:;
  * call from within bdb_db_close()
  */
 int
-bdb_monitor_close( BackendDB *be )
+bdb_monitor_db_close( BackendDB *be )
 {
        struct bdb_info         *bdb = (struct bdb_info *) be->be_private;
 
        if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_filter ) ) {
-               BackendInfo *mi = backend_info( "monitor" );
-               monitor_extra_t *mbe;
-
-               if ( !mi || !mi->bi_extra )
-                       return 0;
-               mbe = mi->bi_extra;
-               mbe->unregister_entry_callback( NULL,
-                       (monitor_callback_t *)bdb->bi_monitor.bdm_cb,
-                       &bdb->bi_monitor.bdm_nbase,
-                       bdb->bi_monitor.bdm_scope,
-                       &bdb->bi_monitor.bdm_filter );
+               BackendInfo             *mi = backend_info( "monitor" );
+               monitor_extra_t         *mbe;
+
+               if ( mi && &mi->bi_extra ) {
+                       mbe = mi->bi_extra;
+                       mbe->unregister_entry_callback( NULL,
+                               (monitor_callback_t *)bdb->bi_monitor.bdm_cb,
+                               &bdb->bi_monitor.bdm_nbase,
+                               bdb->bi_monitor.bdm_scope,
+                               &bdb->bi_monitor.bdm_filter );
+               }
 
                if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_filter ) ) {
                        ch_free( bdb->bi_monitor.bdm_filter.bv_val );
@@ -494,7 +497,7 @@ bdb_monitor_close( BackendDB *be )
  * call from within bdb_db_destroy()
  */
 int
-bdb_monitor_destroy( BackendDB *be )
+bdb_monitor_db_destroy( BackendDB *be )
 {
        return 0;
 }

diff --git a/servers/slapd/back-bdb/proto-bdb.h b/servers/slapd/back-bdb/proto-bdb.h
index f3b69fc7aaadaededa8f0c1fd86e41c1da510b3f..62b350e3f214a0a54533a69714ace239d536eb57 100644 (file)
--- a/servers/slapd/back-bdb/proto-bdb.h
+++ b/servers/slapd/back-bdb/proto-bdb.h
@@ -429,11 +429,10 @@ int bdb_modify_internal(
 /*
  * monitor.c
  */
-int bdb_monitor_initialize( void );
-int bdb_monitor_init( BackendDB *be );
-int bdb_monitor_open( BackendDB *be );
-int bdb_monitor_close( BackendDB *be );
-int bdb_monitor_destroy( BackendDB *be );
+int bdb_monitor_db_init( BackendDB *be );
+int bdb_monitor_db_open( BackendDB *be );
+int bdb_monitor_db_close( BackendDB *be );
+int bdb_monitor_db_destroy( BackendDB *be );
 
 /*
  * cache.c