Commit d892b3a6 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

more about ITS#6243

parent d4f62dec
...@@ -305,10 +305,6 @@ bdb_monitor_db_init( BackendDB *be ) ...@@ -305,10 +305,6 @@ bdb_monitor_db_init( BackendDB *be )
{ {
struct bdb_info *bdb = (struct bdb_info *) be->be_private; struct bdb_info *bdb = (struct bdb_info *) be->be_private;
if ( SLAP_GLUE_SUBORDINATE( be ) ) {
return 0;
}
if ( bdb_monitor_initialize() == LDAP_SUCCESS ) { if ( bdb_monitor_initialize() == LDAP_SUCCESS ) {
/* monitoring in back-bdb is on by default */ /* monitoring in back-bdb is on by default */
SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING; SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_MONITORING;
...@@ -340,10 +336,6 @@ bdb_monitor_db_open( BackendDB *be ) ...@@ -340,10 +336,6 @@ bdb_monitor_db_open( BackendDB *be )
return 0; return 0;
} }
if ( SLAP_GLUE_SUBORDINATE( be ) ) {
return 0;
}
mi = backend_info( "monitor" ); mi = backend_info( "monitor" );
if ( !mi || !mi->bi_extra ) { if ( !mi || !mi->bi_extra ) {
SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING; SLAP_DBFLAGS( be ) ^= SLAP_DBFLAG_MONITORING;
...@@ -491,10 +483,6 @@ bdb_monitor_db_close( BackendDB *be ) ...@@ -491,10 +483,6 @@ bdb_monitor_db_close( BackendDB *be )
{ {
struct bdb_info *bdb = (struct bdb_info *) be->be_private; 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 ) ) { if ( !BER_BVISNULL( &bdb->bi_monitor.bdm_ndn ) ) {
BackendInfo *mi = backend_info( "monitor" ); BackendInfo *mi = backend_info( "monitor" );
monitor_extra_t *mbe; monitor_extra_t *mbe;
...@@ -518,18 +506,12 @@ bdb_monitor_db_close( BackendDB *be ) ...@@ -518,18 +506,12 @@ bdb_monitor_db_close( BackendDB *be )
int int
bdb_monitor_db_destroy( BackendDB *be ) bdb_monitor_db_destroy( BackendDB *be )
{ {
if ( SLAP_GLUE_SUBORDINATE( be ) ) {
return 0;
}
#ifdef BDB_MONITOR_IDX #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 */ /* TODO: free tree */
ldap_pvt_thread_mutex_destroy( &bdb->bi_idx_mutex ); ldap_pvt_thread_mutex_destroy( &bdb->bi_idx_mutex );
avl_free( bdb->bi_idx, ch_free ); avl_free( bdb->bi_idx, ch_free );
}
#endif /* BDB_MONITOR_IDX */ #endif /* BDB_MONITOR_IDX */
return 0; return 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment