X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Ferror.c;h=61ae88f4b6797db61a6d1d82c7aa78ceee796777;hb=c20be31e4a0f4e62bb545cfc9f4d5683344d701f;hp=34cac4600b233b2ca194d62a893c20b14dd45bc1;hpb=3b15c6f10fe0c205a6a2c263483eb896e13cc79d;p=openldap

diff --git a/libraries/libldap/error.c b/libraries/libldap/error.c
index 34cac4600b..61ae88f4b6 100644
--- a/libraries/libldap/error.c
+++ b/libraries/libldap/error.c
@@ -92,7 +92,7 @@ static const struct ldaperror ldap_errlist[] = {
 	{LDAP_CLIENT_LOOP,				"Client Loop" },
 	{LDAP_REFERRAL_LIMIT_EXCEEDED,	"Referral Limit Exceeded" },
 
-	{-1, 0 }
+	{-1, NULL }
 };
 
 static const struct ldaperror *
@@ -150,7 +150,7 @@ ldap_perror( LDAP *ld, LDAP_CONST char *str )
 	}
 
 	if ( ld->ld_matched != NULL && ld->ld_matched[0] != '\0' ) {
-		fprintf( stderr, "\tmatched: \"%s\"\n",
+		fprintf( stderr, "\tmatched DN: \"%s\"\n",
 			ld->ld_matched );
 	}
 
@@ -211,7 +211,6 @@ ldap_parse_result(
 	LDAPMessage	*lm;
 	ber_int_t errcode = LDAP_SUCCESS;
 
-	int rc;
 	ber_tag_t tag;
 	BerElement	*ber;
 
@@ -232,10 +231,11 @@ ldap_parse_result(
 	if(serverctrls != NULL) *serverctrls = NULL;
 
 	/* Find the next result... */
-	for ( lm = r; lm->lm_chain != NULL; lm = lm->lm_chain ) {
+	for ( lm = r; lm != NULL; lm = lm->lm_chain ) {
 		/* skip over entries and references */
 		if( lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY &&
-			lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE )
+			lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE &&
+			lm->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )
 		{
 			break;
 		}
@@ -306,7 +306,7 @@ ldap_parse_result(
 		}
 
 		if( tag != LBER_ERROR ) {
-			rc = ldap_int_get_controls( ber, serverctrls );
+			int rc = ldap_int_get_controls( ber, serverctrls );
 
 			if( rc != LDAP_SUCCESS ) {
 				tag = LBER_ERROR;
@@ -342,7 +342,8 @@ ldap_parse_result(
 		for ( lm = lm->lm_chain; lm != NULL; lm = lm->lm_chain ) {
 			/* skip over entries and references */
 			if( lm->lm_msgtype != LDAP_RES_SEARCH_ENTRY &&
-				lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE )
+				lm->lm_msgtype != LDAP_RES_SEARCH_REFERENCE &&
+				lm->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL )
 			{
 				/* more results to return */
 				errcode = LDAP_MORE_RESULTS_TO_RETURN;