From: Howard Chu <hyc@openldap.org>
Date: Thu, 25 Sep 2008 10:31:49 +0000 (+0000)
Subject: Revert 1.394, see ITS#5454. It still locks up without a trylock.
X-Git-Tag: ACLCHECK_0~1317
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a49d43ca274d8e3b17c4db75943d64b392b09f62;p=openldap

Revert 1.394, see ITS#5454. It still locks up without a trylock.
---

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