upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-08 08:02:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More for ITS#6011

Browse source
This commit is contained in:
Howard Chu 2009-03-17 00:56:23 +00:00
parent b697550ddc
commit 47f31dcd8e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servers/slapd/syncrepl.c
View file

@ -1258,11 +1258,11 @@ do_syncrepl(
int i, defer = 1, fail = 0;
Backend *be;
Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl %s\n", si->si_ridtxt, 0, 0 );
if ( si == NULL )
return NULL;
Debug( LDAP_DEBUG_TRACE, "=>do_syncrepl %s\n", si->si_ridtxt, 0, 0 );
/* Don't get stuck here while a pause is initiated */
while ( ldap_pvt_thread_mutex_trylock( &si->si_mutex )) {
if ( slapd_shutdown )
@ -4597,11 +4597,15 @@ syncrepl_config( ConfigArgs *c )
* happen when running on the cn=config DB.
*/
if ( si->si_re ) {
if ( ldap_pvt_thread_mutex_trylock( &si->si_mutex )) {
Connection *c;
if ( ldap_pvt_thread_mutex_trylock( &si->si_mutex ))
isrunning = 1;
} else {
c = si->si_conn;
si->si_conn = NULL;
if ( c )
connection_client_stop( c );
if ( !isrunning )
ldap_pvt_thread_mutex_unlock( &si->si_mutex );
}
}
if ( si->si_re && isrunning ) {
si->si_ctype = 0;