From: Rein Tollevik <rein@openldap.org>
Date: Sun, 5 Oct 2008 19:29:00 +0000 (+0000)
Subject: Revert 1.410, i.e back to lock again.  ITS#5725 fixes the lock situation.
X-Git-Tag: ACLCHECK_0~1292
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5f584e62bf446efb1644caced92af31194fed42;p=openldap

Revert 1.410, i.e back to lock again.  ITS#5725 fixes the lock situation.
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 4ceabf64a3..15612e6fca 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1214,9 +1214,8 @@ do_syncrepl(
 	if ( si == NULL )
 		return NULL;
 
-	/* There must never be more than one instance active */
-	if ( ldap_pvt_thread_mutex_trylock( &si->si_mutex ))
-		return NULL;
+	/* There will never be more than one instance active */
+	ldap_pvt_thread_mutex_lock( &si->si_mutex );
 
 	switch( abs( si->si_type ) ) {
 	case LDAP_SYNC_REFRESH_ONLY: