Commit deba0105 authored by Tero Saarni's avatar Tero Saarni
Browse files

ITS#9468 do not arm expire timer for connections that are already tainted

parent efb84b3e
Pipeline #2680 passed with stage
in 54 minutes and 47 seconds
......@@ -3122,6 +3122,8 @@ ldap_back_conn_prune( ldapinfo_t *li )
while ( lc ) {
ldapconn_t *next = LDAP_TAILQ_NEXT( lc, lc_q );
if ( !LDAP_BACK_CONN_TAINTED( lc ) ) {
time_t conn_expires = ldap_back_conn_expire_time( li, lc );
if ( now >= conn_expires ) {
......@@ -3140,6 +3142,7 @@ ldap_back_conn_prune( ldapinfo_t *li )
/* next_timeout was not yet initialized or current connection expires sooner */
next_timeout = conn_expires;
}
}
lc = next;
}
......@@ -3149,6 +3152,8 @@ ldap_back_conn_prune( ldapinfo_t *li )
while ( edge ) {
TAvlnode *next = ldap_tavl_next( edge, TAVL_DIR_RIGHT );
ldapconn_t *lc = (ldapconn_t *)edge->avl_data;
if ( !LDAP_BACK_CONN_TAINTED( lc ) ) {
time_t conn_expires = ldap_back_conn_expire_time( li, lc );
if ( now >= conn_expires ) {
......@@ -3166,6 +3171,7 @@ ldap_back_conn_prune( ldapinfo_t *li )
} else if ( next_timeout == -1 || conn_expires < next_timeout ) {
next_timeout = conn_expires;
}
}
edge = next;
}
......
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