(ITS#7050) meta stop at the first unreachable candidate

[victor.gattegno@gmail.com]

Full_Name: victor gattegno
Version: 2.4.26
OS: CentOS 5.6
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (88.181.196.138)


Hello,

With OpenLDAP 2.4.26, as soon as a candidate directory is unreachable, other
directories are not requested by the proxy ; that problem doesn't occur in
2.4.23.

It is described in:
http://www.openldap.org/lists/openldap-technical/201108/msg00221.html

and there is a complete example in:
http://www.openldap.org/lists/openldap-technical/201109/msg00044.html

I modified openldap-2.4.26/servers/slapd/back-meta/search.c (lines 192 to 198)
as follow, and then the problem is solved.

I replaced in OpenLDAP 2.4.26 search.c, (from line 192): 

		switch ( rc ) {
		case LDAP_SUCCESS:
			break;
		case LDAP_UNAVAILABLE:
			goto down;
		default:
			goto other;
		}

by (like it was in 2.4.23):

		if ( rc != LDAP_SUCCESS ) {
			goto down;
		}

Here is the diff :

192,195c192
< 		switch ( rc ) {
< 		case LDAP_SUCCESS:
< 			break;
< 		case LDAP_UNAVAILABLE:
---
> 		if ( rc != LDAP_SUCCESS ) {
197,198d193
< 		default:
< 			goto other;

Rgds.