Death to LBER_END_SEQORSET.

diff --git a/include/lber.h b/include/lber.h
index d3ed3fc272a21fc0428256324bb037d2252a354d..f5c2da1b45677671553d4d221018225604d67886 100644 (file)
--- a/include/lber.h
+++ b/include/lber.h
@@ -67,7 +67,6 @@ LDAP_BEGIN_DECL
 #define LBER_INVALID(tag) ( ( (tag) & 0xFFFFFF80UL ) != 0 )
 #define LBER_ERROR             0xffffffffUL
 #define LBER_DEFAULT           0xffffffffUL
-/* #define LBER_END_SEQORSET   0xfffffffeUL *//* not part of LDAP C-API */
 
 /* general BER types we know about */
 #define LBER_BOOLEAN           0x01UL

diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index aa33b44dad33a9b27520c950d260963d579ba36a..443016fba2f07e13a9bc49b4ee713cea8e131e33 100644 (file)
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -409,11 +409,7 @@ ber_first_element( BerElement *ber, unsigned long *len, char **last )
        *last = ber->ber_ptr + *len;
 
        if ( *last == ber->ber_ptr ) {
-#ifdef LBER_END_SEQORSET 
-               return( LBER_END_SEQORSET );
-#else
                return( LBER_DEFAULT );
-#endif
        }
 
        return( ber_peek_tag( ber, len ) );
@@ -427,11 +423,7 @@ ber_next_element( BerElement *ber, unsigned long *len, char *last )
        assert( last != NULL );
 
        if ( ber->ber_ptr == last ) {
-#ifdef LBER_END_SEQORSET 
-               return( LBER_END_SEQORSET );
-#else
                return( LBER_DEFAULT );
-#endif
        }
 
        return( ber_peek_tag( ber, len ) );
@@ -556,11 +548,7 @@ va_dcl
                        *sss = NULL;
                        j = 0;
                        for ( tag = ber_first_element( ber, &len, &last );
-                           tag != LBER_DEFAULT && 
-#ifdef LBER_END_SEQORSET
-                                       tag != LBER_END_SEQORSET &&
-#endif
-                                       rc != LBER_DEFAULT;
+                           tag != LBER_DEFAULT && rc != LBER_DEFAULT;
                            tag = ber_next_element( ber, &len, last ) )
                        {
                                if ( *sss == NULL ) {
@@ -573,13 +561,6 @@ va_dcl
                                rc = ber_get_stringa( ber, &((*sss)[j]) );
                                j++;
                        }
-#ifdef LBER_END_SEQORSET
-                       if (rc != LBER_DEFAULT && 
-                               tag != LBER_END_SEQORSET )
-                       {
-                               rc = LBER_DEFAULT;
-                       }
-#endif
                        if ( j > 0 )
                                (*sss)[j] = NULL;
                        break;
@@ -589,11 +570,7 @@ va_dcl
                        *bv = NULL;
                        j = 0;
                        for ( tag = ber_first_element( ber, &len, &last );
-                           tag != LBER_DEFAULT && 
-#ifdef LBER_END_SEQORSET
-                                       tag != LBER_END_SEQORSET &&
-#endif
-                                       rc != LBER_DEFAULT;
+                           tag != LBER_DEFAULT && rc != LBER_DEFAULT;
                            tag = ber_next_element( ber, &len, last ) )
                        {
                                if ( *bv == NULL ) {
@@ -606,13 +583,6 @@ va_dcl
                                rc = ber_get_stringal( ber, &((*bv)[j]) );
                                j++;
                        }
-#ifdef LBER_END_SEQORSET
-                       if (rc != LBER_DEFAULT && 
-                               tag != LBER_END_SEQORSET )
-                       {
-                               rc = LBER_DEFAULT;
-                       }
-#endif
                        if ( j > 0 )
                                (*bv)[j] = NULL;
                        break;

diff --git a/libraries/libldap/controls.c b/libraries/libldap/controls.c
index e0fe87b1e74e962b7324dc5a7431909edfc4239c..8d6130c2e16a94f1111b4c2ffc284e064979629c 100644 (file)
--- a/libraries/libldap/controls.c
+++ b/libraries/libldap/controls.c
@@ -140,12 +140,7 @@ int ldap_int_get_controls LDAP_P((
        ctrls[nctrls] = NULL;
 
        for( tag = ber_first_element( ber, &len, &opaque );
-               (
-                       tag != LBER_ERROR
-#ifdef LDAP_END_SEQORSET
-                       && tag != LBER_END_OF_SEQORSET
-#endif
-               );
+               tag != LBER_ERROR;
                tag = ber_next_element( ber, &len, opaque ) )
        {
                LDAPControl *tctrl;