From 1762f730fccf1ee7c093b984a9f568c9c8bb6fe4 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 16 Nov 2005 00:49:54 +0000 Subject: [PATCH] partially revert commit --- servers/slapd/back-monitor/init.c | 171 +++++++++++++++--------------- 1 file changed, 85 insertions(+), 86 deletions(-) diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index 1f6a5777f5..e9332c79ed 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -990,84 +990,6 @@ monitor_back_initialize( { NULL, 0, NULL } }; - int rc; - - bi->bi_controls = controls; - - bi->bi_init = 0; - bi->bi_open = 0; - bi->bi_config = monitor_back_config; - bi->bi_close = 0; - bi->bi_destroy = 0; - - bi->bi_db_init = monitor_back_db_init; - bi->bi_db_config = monitor_back_db_config; - bi->bi_db_open = monitor_back_db_open; - bi->bi_db_close = 0; - bi->bi_db_destroy = monitor_back_db_destroy; - - bi->bi_op_bind = monitor_back_bind; - bi->bi_op_unbind = 0; - bi->bi_op_search = monitor_back_search; - bi->bi_op_compare = monitor_back_compare; - bi->bi_op_modify = monitor_back_modify; - bi->bi_op_modrdn = 0; - bi->bi_op_add = 0; - bi->bi_op_delete = 0; - bi->bi_op_abandon = 0; - - bi->bi_extended = 0; - - bi->bi_entry_release_rw = 0; - bi->bi_chk_referrals = 0; - bi->bi_operational = monitor_back_operational; - - /* - * hooks for slap tools - */ - bi->bi_tool_entry_open = 0; - bi->bi_tool_entry_close = 0; - bi->bi_tool_entry_first = 0; - bi->bi_tool_entry_next = 0; - bi->bi_tool_entry_get = 0; - bi->bi_tool_entry_put = 0; - bi->bi_tool_entry_reindex = 0; - bi->bi_tool_sync = 0; - bi->bi_tool_dn2id_get = 0; - bi->bi_tool_id2entry_get = 0; - bi->bi_tool_entry_modify = 0; - - bi->bi_connection_init = 0; - bi->bi_connection_destroy = 0; - - /* - * configuration objectClasses (fake) - */ - bi->bi_cf_ocs = monitorocs; - - rc = config_register_schema( monitorcfg, monitorocs ); - if ( rc ) { - return rc; - } - - return 0; -} - -int -monitor_back_db_init( - BackendDB *be ) -{ - int rc; - struct berval dn = BER_BVC( SLAPD_MONITOR_DN ), - pdn, - ndn; - BackendDB *be2; - - monitor_subsys_t *ms; - monitor_info_t *mi = &monitor_info; - int i; - const char *text; - struct m_s { char *name; char *schema; @@ -1342,14 +1264,9 @@ monitor_back_db_init( { NULL, NULL, 0, -1 } }; - /* - * register subsys - */ - for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) { - if ( monitor_back_register_subsys( ms ) ) { - return -1; - } - } + int i, rc; + const char *text; + monitor_info_t *mi = &monitor_info; /* schema integration */ for ( i = 0; mat[ i ].name; i++ ) { @@ -1440,6 +1357,88 @@ monitor_back_db_init( ((ObjectClass **)&(((char *)mi)[ moc[ i ].offset ]))[ 0 ] = Oc; } + bi->bi_controls = controls; + + bi->bi_init = 0; + bi->bi_open = 0; + bi->bi_config = monitor_back_config; + bi->bi_close = 0; + bi->bi_destroy = 0; + + bi->bi_db_init = monitor_back_db_init; + bi->bi_db_config = monitor_back_db_config; + bi->bi_db_open = monitor_back_db_open; + bi->bi_db_close = 0; + bi->bi_db_destroy = monitor_back_db_destroy; + + bi->bi_op_bind = monitor_back_bind; + bi->bi_op_unbind = 0; + bi->bi_op_search = monitor_back_search; + bi->bi_op_compare = monitor_back_compare; + bi->bi_op_modify = monitor_back_modify; + bi->bi_op_modrdn = 0; + bi->bi_op_add = 0; + bi->bi_op_delete = 0; + bi->bi_op_abandon = 0; + + bi->bi_extended = 0; + + bi->bi_entry_release_rw = 0; + bi->bi_chk_referrals = 0; + bi->bi_operational = monitor_back_operational; + + /* + * hooks for slap tools + */ + bi->bi_tool_entry_open = 0; + bi->bi_tool_entry_close = 0; + bi->bi_tool_entry_first = 0; + bi->bi_tool_entry_next = 0; + bi->bi_tool_entry_get = 0; + bi->bi_tool_entry_put = 0; + bi->bi_tool_entry_reindex = 0; + bi->bi_tool_sync = 0; + bi->bi_tool_dn2id_get = 0; + bi->bi_tool_id2entry_get = 0; + bi->bi_tool_entry_modify = 0; + + bi->bi_connection_init = 0; + bi->bi_connection_destroy = 0; + + /* + * configuration objectClasses (fake) + */ + bi->bi_cf_ocs = monitorocs; + + rc = config_register_schema( monitorcfg, monitorocs ); + if ( rc ) { + return rc; + } + + return 0; +} + +int +monitor_back_db_init( + BackendDB *be ) +{ + int rc; + struct berval dn = BER_BVC( SLAPD_MONITOR_DN ), + pdn, + ndn; + BackendDB *be2; + + monitor_subsys_t *ms; + + /* + * register subsys + */ + for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) { + if ( monitor_back_register_subsys( ms ) ) { + return -1; + } + } + /* * database monitor can be defined once only */ -- 2.39.5