From f1f9a6280a1b07475fc3a5191b96eb5000b5faa1 Mon Sep 17 00:00:00 2001 From: Rein Tollevik Date: Sun, 5 Oct 2008 22:35:44 +0000 Subject: [PATCH] ITS#5726: Revert 1.392, the runqueue must always be inspected. --- servers/slapd/syncrepl.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 15612e6fca..128f302956 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -1204,7 +1204,7 @@ do_syncrepl( OperationBuffer opbuf; Operation *op; int rc = LDAP_SUCCESS; - int dostop = 0, do_setup = 0; + int dostop = 0; ber_socket_t s; int i, defer = 1, fail = 0; Backend *be; @@ -1319,9 +1319,8 @@ reload: if ( rc == LDAP_SUCCESS ) { if ( si->si_conn ) { connection_client_enable( si->si_conn ); - goto success; } else { - do_setup = 1; + si->si_conn = connection_client_setup( s, do_syncrepl, arg ); } } else if ( si->si_conn ) { dostop = 1; @@ -1388,11 +1387,6 @@ reload: } ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex ); - - if ( do_setup ) - si->si_conn = connection_client_setup( s, do_syncrepl, arg ); - -success: ldap_pvt_thread_mutex_unlock( &si->si_mutex ); if ( rc ) { -- 2.39.5