upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-09 16:34:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to ITS#5304

Browse source
This commit is contained in:
Pierangelo Masarati 2008-01-02 17:30:40 +00:00
parent 622c4d3884
commit 859c6d03c0
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/libldap/extended.c
View file

@ -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;
}