Commit 6e62c293 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5592

parent ab0c0938
OpenLDAP 2.4 Change Log
OpenLDAP 2.4.12 Engineering
Fixed slapd-meta quarantine behavior (ITS#5592)
Fixed slapo-constraint string termination (ITS#5609)
Fixed slapo-rwm callback cleanup (ITS#5601)
......
......@@ -289,11 +289,12 @@ meta_back_init_one_conn(
* don't return the connection */
if ( mt->mt_isquarantined ) {
slap_retry_info_t *ri = &mt->mt_quarantine;
int dont_retry = 1;
int dont_retry = 0;
if ( mt->mt_quarantine.ri_interval ) {
ldap_pvt_thread_mutex_lock( &mt->mt_quarantine_mutex );
if ( mt->mt_isquarantined == LDAP_BACK_FQ_YES ) {
dont_retry = ( mt->mt_isquarantined > LDAP_BACK_FQ_NO );
if ( dont_retry ) {
dont_retry = ( ri->ri_num[ ri->ri_idx ] == SLAP_RETRYNUM_TAIL
|| slap_get_time() < ri->ri_last + ri->ri_interval[ ri->ri_idx ] );
if ( !dont_retry ) {
......@@ -307,9 +308,10 @@ meta_back_init_one_conn(
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf, 0 );
}
mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
}
mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
}
ldap_pvt_thread_mutex_unlock( &mt->mt_quarantine_mutex );
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment