From d892b3a6ed29faddb288f0fdeb9cf92416cac68c Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 17 Aug 2009 23:52:54 +0000 Subject: [PATCH] more about ITS#6243 --- servers/slapd/back-bdb/monitor.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/servers/slapd/back-bdb/monitor.c b/servers/slapd/back-bdb/monitor.c index 84e2d0c338..a333c2132d 100644 --- a/servers/slapd/back-bdb/monitor.c +++ b/servers/slapd/back-bdb/monitor.c @@ -305,10 +305,6 @@ bdb_monitor_db_init( BackendDB *be ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - if ( SLAP_GLUE_SUBORDINATE( be ) ) { - return 0; - } - if ( bdb_monitor_initialize() == LDAP_SUCCESS ) { /* monitoring in back-bdb is on by default */ SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING; @@ -340,10 +336,6 @@ bdb_monitor_db_open( BackendDB *be ) return 0; } - if ( SLAP_GLUE_SUBORDINATE( be ) ) { - return 0; - } - mi = backend_info( "monitor" ); if ( !mi || !mi->bi_extra ) { SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING; @@ -491,10 +483,6 @@ bdb_monitor_db_close( BackendDB *be ) { struct bdb_info *bdb = (struct bdb_info *) be->be_private; - if ( SLAP_GLUE_SUBORDINATE( be ) ) { - return 0; - } - if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_ndn ) ) { BackendInfo *mi = backend_info( "monitor" ); monitor_extra_t *mbe; @@ -518,18 +506,12 @@ bdb_monitor_db_close( BackendDB *be ) int bdb_monitor_db_destroy( BackendDB *be ) { - if ( SLAP_GLUE_SUBORDINATE( be ) ) { - return 0; - } - #ifdef BDB_MONITOR_IDX - { - struct bdb_info *bdb = (struct bdb_info *) be->be_private; + struct bdb_info *bdb = (struct bdb_info *) be->be_private; - /* TODO: free tree */ - ldap_pvt_thread_mutex_destroy( &bdb->bi_idx_mutex ); - avl_free( bdb->bi_idx, ch_free ); - } + /* TODO: free tree */ + ldap_pvt_thread_mutex_destroy( &bdb->bi_idx_mutex ); + avl_free( bdb->bi_idx, ch_free ); #endif /* BDB_MONITOR_IDX */ return 0; -- 2.39.5