ITS#5304

diff --git a/CHANGES b/CHANGES
index f2b98d85b7c36807626308f3756978849f87e15d..e505f46fcb4f091dfdb9437f6fd13466ed67f9ae 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 extended decoding (ITS#5304)
        Fixed libldap filter abort (ITS#5300)
        Fixed libldap ldap_parse_sasl_bind_result (ITS#5263)
        Fixed libldap search timeout crash (ITS#5291)

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 5a6efda9f13bb0348122842a591b783e4b1768f6..1a2fc2a65ab00ced847d968e11b4a33d0a4b2d68 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -291,7 +291,6 @@ ldap_parse_intermediate (
        int                             freeit )
 {
        BerElement *ber;
-       ber_tag_t rc;
        ber_tag_t tag;
        ber_len_t len;
        struct berval *resdata;
@@ -324,9 +323,9 @@ ldap_parse_intermediate (
                return ld->ld_errno;
        }
 
-       rc = ber_scanf( ber, "{" /*}*/ );
+       tag = ber_scanf( ber, "{" /*}*/ );
 
-       if( rc == LBER_ERROR ) {
+       if( tag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
                ber_free( ber, 0 );
                return ld->ld_errno;
@@ -367,16 +366,16 @@ ldap_parse_intermediate (
        }
 
        if ( serverctrls == NULL ) {
-               rc = LDAP_SUCCESS;
+               ld->ld_errno = LDAP_SUCCESS;
                goto free_and_return;
        }
 
        if ( ber_scanf( ber, /*{*/ "}" ) == LBER_ERROR ) {
-               rc = LDAP_DECODING_ERROR;
+               ld->ld_errno = LDAP_DECODING_ERROR;
                goto free_and_return;
        }
 
-       rc = ldap_pvt_get_controls( ber, serverctrls );
+       ld->ld_errno = ldap_pvt_get_controls( ber, serverctrls );
 
 free_and_return:
        ber_free( ber, 0 );
@@ -397,6 +396,6 @@ free_and_return:
                ldap_msgfree( res );
        }
 
-       return LDAP_SUCCESS;
+       return ld->ld_errno;
 }