mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-28 02:29:34 -05:00
Moved the check for existing monitor database to the top, otherwise trying
to add multiple monitor databases through back-config deadlocks the server.
This commit is contained in:
parent
848be16aaf
commit
cb207b846a
1 changed files with 9 additions and 9 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue