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 a9214532946dc2489b74d4d8db3bb1381954d85d..30f4c63dc502236652770ef193c4fe31e4c2b2c8 100644 (file)
--- 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: