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 4ceabf64a34ef86ea837e184f674cee4cbd7f22d..15612e6fcad2f5fdb842ac04650c9e62662f2756 100644 (file)
--- 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: