ITS#5263

diff --git a/CHANGES b/CHANGES
index 3345e0d14abff881fd81b9a6607ab3482820c0df..93b833cb9c237019f371b236ca9ffaf593e6f0f6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.8 Engineering
        Fixed ldapmodify verbose logging (ITS#5247)
+       Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
        Fixed slapd include handling (ITS#5276)
        Fixed slapd non-atomic signal variables (ITS#5248)
        Fixed slapd-ldif delete (ITS#5265)

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 0b02065c351ca20ab5ba957ea184efb17123744d..c7b18ac91dd5a7f633a4e1924e40426ce3c1be2c 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -201,7 +201,7 @@ ldap_sasl_bind_s(
                rc = ldap_parse_sasl_bind_result( ld, result, &scredp, 0 );
        }
 
-       if ( rc != LDAP_SUCCESS && rc != LDAP_SASL_BIND_IN_PROGRESS ) {
+       if ( rc != LDAP_SUCCESS ) {
                ldap_msgfree( result );
                return( rc );
        }
@@ -347,7 +347,7 @@ ldap_parse_sasl_bind_result(
                ldap_msgfree( res );
        }
 
-       return( ld->ld_errno );
+       return( LDAP_SUCCESS );
 }
 
 int