ITS#1730

[openldap] / libraries / libldap / request.c

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index b80a10d468e831198e1dc9b62363bae7d4e2cd6f..5c018ca7b88e4bcdff6b2c8c8e60ddbc7e617035 100644 (file)
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -1081,6 +1081,7 @@ re_encode_request( LDAP *ld,
         */
        ber_int_t       along;
        ber_tag_t       tag;
+       ber_tag_t       rtag;
        ber_int_t       ver;
        ber_int_t       scope;
        int             rc;
@@ -1108,9 +1109,9 @@ re_encode_request( LDAP *ld,
         * tagged with the operation code.  For delete, the provided DN
         * is not wrapped by a sequence.
         */
-       rc = ber_scanf( &tmpber, "{it", /*}*/ &along, &tag );
+       rtag = ber_scanf( &tmpber, "{it", /*}*/ &along, &tag );
 
-       if ( rc == LBER_ERROR ) {
+       if ( rtag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
                return( NULL );
        }
@@ -1118,15 +1119,15 @@ re_encode_request( LDAP *ld,
        assert( tag != 0);
        if ( tag == LDAP_REQ_BIND ) {
                /* bind requests have a version number before the DN & other stuff */
-               rc = ber_scanf( &tmpber, "{ia" /*}*/, &ver, &orig_dn );
+               rtag = ber_scanf( &tmpber, "{ia" /*}*/, &ver, &orig_dn );
 
        } else if ( tag == LDAP_REQ_DELETE ) {
                /* delete requests don't have a DN wrapping sequence */
-               rc = ber_scanf( &tmpber, "a", &orig_dn );
+               rtag = ber_scanf( &tmpber, "a", &orig_dn );
 
        } else if ( tag == LDAP_REQ_SEARCH ) {
                /* search requests need to be re-scope-ed */
-               rc = ber_scanf( &tmpber, "{ae" /*"}"*/, &orig_dn, &scope );
+               rtag = ber_scanf( &tmpber, "{ae" /*"}"*/, &orig_dn, &scope );
 
                if( srv->lud_scope != LDAP_SCOPE_DEFAULT ) {
                        /* use the scope provided in reference */
@@ -1141,10 +1142,10 @@ re_encode_request( LDAP *ld,
                }
 
        } else {
-               rc = ber_scanf( &tmpber, "{a" /*}*/, &orig_dn );
+               rtag = ber_scanf( &tmpber, "{a" /*}*/, &orig_dn );
        }
 
-       if( rc == LBER_ERROR ) {
+       if( rtag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
                return NULL;
        }