upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 15:49:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Death to LBER_END_SEQORSET.

Browse source
This commit is contained in:
Kurt Zeilenga 1999-05-28 03:24:41 +00:00
parent 2b9a296eb4
commit 6e0c7b95ab
3 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/lber.h
View file

@ -67,7 +67,6 @@ LDAP_BEGIN_DECL
#define LBER_INVALID(tag) ( ( (tag) & 0xFFFFFF80UL ) != 0 ) #define LBER_INVALID(tag) ( ( (tag) & 0xFFFFFF80UL ) != 0 )
#define LBER_ERROR 0xffffffffUL #define LBER_ERROR 0xffffffffUL
#define LBER_DEFAULT 0xffffffffUL #define LBER_DEFAULT 0xffffffffUL
/* #define LBER_END_SEQORSET 0xfffffffeUL *//* not part of LDAP C-API */
/* general BER types we know about */ /* general BER types we know about */
#define LBER_BOOLEAN 0x01UL #define LBER_BOOLEAN 0x01UL

34
libraries/liblber/decode.c
View file

@ -409,11 +409,7 @@ ber_first_element( BerElement *ber, unsigned long *len, char **last )
*last = ber->ber_ptr + *len; *last = ber->ber_ptr + *len;
if ( *last == ber->ber_ptr ) { if ( *last == ber->ber_ptr ) {
#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );
#else
return( LBER_DEFAULT ); return( LBER_DEFAULT );
#endif
} }
return( ber_peek_tag( ber, len ) ); return( ber_peek_tag( ber, len ) );
@ -427,11 +423,7 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last )
assert( last != NULL ); assert( last != NULL );
if ( ber->ber_ptr == last ) { if ( ber->ber_ptr == last ) {
#ifdef LBER_END_SEQORSET
return( LBER_END_SEQORSET );
#else
return( LBER_DEFAULT ); return( LBER_DEFAULT );
#endif
} }
return( ber_peek_tag( ber, len ) ); return( ber_peek_tag( ber, len ) );
@ -556,11 +548,7 @@ va_dcl
*sss = NULL; *sss = NULL;
j = 0; j = 0;
for ( tag = ber_first_element( ber, &len, &last ); for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT && tag != LBER_DEFAULT && rc != LBER_DEFAULT;
#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) ) tag = ber_next_element( ber, &len, last ) )
{ {
if ( *sss == NULL ) { if ( *sss == NULL ) {
@ -573,13 +561,6 @@ va_dcl
rc = ber_get_stringa( ber, &((*sss)[j]) ); rc = ber_get_stringa( ber, &((*sss)[j]) );
j++; j++;
} }
#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
rc = LBER_DEFAULT;
}
#endif
if ( j > 0 ) if ( j > 0 )
(*sss)[j] = NULL; (*sss)[j] = NULL;
break; break;
@ -589,11 +570,7 @@ va_dcl
*bv = NULL; *bv = NULL;
j = 0; j = 0;
for ( tag = ber_first_element( ber, &len, &last ); for ( tag = ber_first_element( ber, &len, &last );
tag != LBER_DEFAULT && tag != LBER_DEFAULT && rc != LBER_DEFAULT;
#ifdef LBER_END_SEQORSET
tag != LBER_END_SEQORSET &&
#endif
rc != LBER_DEFAULT;
tag = ber_next_element( ber, &len, last ) ) tag = ber_next_element( ber, &len, last ) )
{ {
if ( *bv == NULL ) { if ( *bv == NULL ) {
@ -606,13 +583,6 @@ va_dcl
rc = ber_get_stringal( ber, &((*bv)[j]) ); rc = ber_get_stringal( ber, &((*bv)[j]) );
j++; j++;
} }
#ifdef LBER_END_SEQORSET
if (rc != LBER_DEFAULT &&
tag != LBER_END_SEQORSET )
{
rc = LBER_DEFAULT;
}
#endif
if ( j > 0 ) if ( j > 0 )
(*bv)[j] = NULL; (*bv)[j] = NULL;
break; break;

7
libraries/libldap/controls.c
View file

@ -140,12 +140,7 @@ int ldap_int_get_controls LDAP_P((
ctrls[nctrls] = NULL; ctrls[nctrls] = NULL;
for( tag = ber_first_element( ber, &len, &opaque ); for( tag = ber_first_element( ber, &len, &opaque );
( tag != LBER_ERROR;
tag != LBER_ERROR
#ifdef LDAP_END_SEQORSET
&& tag != LBER_END_OF_SEQORSET
#endif
);
tag = ber_next_element( ber, &len, opaque ) ) tag = ber_next_element( ber, &len, opaque ) )
{ {
LDAPControl *tctrl; LDAPControl *tctrl;