Commit 5570c977 authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

re-fix ITS#4405 (really start from the first conn)

parent f11560b6
OpenLDAP 2.3 Change Log OpenLDAP 2.3 Change Log
OpenLDAP 2.3.27 Engineering OpenLDAP 2.3.27 Engineering
Fixed libldap dangling pointer issue (previous fix was broken) (ITS#4405)
OpenLDAP 2.3.26 Release OpenLDAP 2.3.26 Release
Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610) Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610)
......
...@@ -333,8 +333,7 @@ wait4msg( ...@@ -333,8 +333,7 @@ wait4msg(
ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex ); ldap_pvt_thread_mutex_lock( &ld->ld_conn_mutex );
#endif #endif
for ( lc = ld->ld_conns; for ( lc = ld->ld_conns;
rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; rc == LDAP_MSG_X_KEEP_LOOKING && lc != NULL; )
lc = lc->lconn_next )
{ {
if ( lc->lconn_status == LDAP_CONNST_CONNECTED && if ( lc->lconn_status == LDAP_CONNST_CONNECTED &&
ldap_is_read_ready( ld, lc->lconn_sb )) ldap_is_read_ready( ld, lc->lconn_sb ))
...@@ -353,8 +352,14 @@ wait4msg( ...@@ -353,8 +352,14 @@ wait4msg(
* sane; better restart * sane; better restart
* (ITS#4405) */ * (ITS#4405) */
lc = ld->ld_conns; lc = ld->ld_conns;
/* don't get to next conn! */
break;
} }
} }
/* next conn */
lc = lc->lconn_next;
} }
#ifdef LDAP_R_COMPILE #ifdef LDAP_R_COMPILE
ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex ); ldap_pvt_thread_mutex_unlock( &ld->ld_conn_mutex );
......
Markdown is supported
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