From cb207b846a4a5a6f2236c249a21baabda5a84d26 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 4 Apr 2007 17:14:09 +0000 Subject: [PATCH] Moved the check for existing monitor database to the top, otherwise trying to add multiple monitor databases through back-config deadlocks the server. --- servers/slapd/back-monitor/init.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c index f2b798b156..594a42974a 100644 --- a/servers/slapd/back-monitor/init.c +++ b/servers/slapd/back-monitor/init.c @@ -2062,15 +2062,6 @@ monitor_back_db_init( 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 */ @@ -2081,6 +2072,15 @@ monitor_back_db_init( } be_monitor = be; + /* + * register subsys + */ + for ( ms = known_monitor_subsys; ms->mss_name != NULL; ms++ ) { + if ( monitor_back_register_subsys( ms ) ) { + return -1; + } + } + /* indicate system schema supported */ SLAP_BFLAGS(be) |= SLAP_BFLAG_MONITOR; -- 2.39.5