From a49d43ca274d8e3b17c4db75943d64b392b09f62 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 25 Sep 2008 10:31:49 +0000 Subject: [PATCH] Revert 1.394, see ITS#5454. It still locks up without a trylock. --- servers/slapd/syncrepl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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: -- 2.39.5