From: Howard Chu <hyc@openldap.org>
Date: Thu, 17 Sep 2020 14:22:01 +0000 (+0100)
Subject: ITS#9339 Fix syncrepl_monitor_init for dynamic monitor backend
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~9^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b512ea79c162c63d26ee20179b23bc0af3393b0;p=thirdparty%2Fopenldap.git

ITS#9339 Fix syncrepl_monitor_init for dynamic monitor backend

Calling from backend.c only works if back-monitor is a static backend
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index f15ee9e815..6215841c82 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -116,8 +116,10 @@ int backend_init(void)
 
 		LDAP_STAILQ_INSERT_TAIL(&backendInfo, bi, bi_next);
 	}
+#if defined(SLAPD_MONITOR) && SLAPD_MONITOR == SLAPD_MOD_STATIC
 	/* HACK: need schema defined in deterministic order */
 	syncrepl_monitor_init();
+#endif
 
 
 	if ( nBackendInfo > 0) {
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 5c534f7bc3..fbc9a06693 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -7069,6 +7069,7 @@ add_syncrepl(
 		si->si_cookieState->cs_ref++;
 
 		si->si_next = NULL;
+		syncrepl_monitor_init();
 
 		return 0;
 	}