From: Howard Chu <hyc@openldap.org>
Date: Tue, 20 Oct 2015 20:27:21 +0000 (+0100)
Subject: ITS#8277 simpler check for syncrepl on config DB
X-Git-Tag: OPENLDAP_REL_ENG_2_4_43~34
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=9881b060c315e150b047a0cad263b316f4059ddf

ITS#8277 simpler check for syncrepl on config DB

Windows mutexes are recursive so the trylock test will succeed
even though the mutex is already locked. Just compare be pointers.
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 8323e130a6..db9a39b12a 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -5626,7 +5626,7 @@ syncrepl_config( ConfigArgs *c )
 					 * happen when running on the cn=config DB.
 					 */
 					if ( si->si_re ) {
-						if ( ldap_pvt_thread_mutex_trylock( &si->si_mutex )) {
+						if ( si->si_be == c->be || ldap_pvt_thread_mutex_trylock( &si->si_mutex )) {
 							isrunning = 1;
 						} else {
 							/* There is no active thread, but we must still