X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetattr.c;h=91e37b28351ed993818b83e492a46d00d27d798d;hb=3b9f4a82ee478c943a66696adf9133dc9f503e16;hp=ae645534fb724943df2e043d516abe62f9c50a2b;hpb=f42966f9e1ac239213e236b93375559a1e25ba5f;p=openldap

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index ae645534fb..91e37b2835 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -26,11 +26,15 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 {
 	int rc;
 	ber_tag_t tag;
-	ber_len_t len;
+	ber_len_t len = 0;
 	char *attr;
 	BerElement *ber;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ENTRY, "ldap_first_attribute\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
@@ -51,20 +55,13 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 	 * us at the first attribute.
 	 */
 
-	tag = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
+	tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
 	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		ber_free( ber, 0 );
-		return  NULL;
-	}
-
-#if LDAP_SEQORSET_BAILOUT
-	if( len == 0 ) {
 		return NULL;
 	}
-#endif
-	
-#if LBER_SEQORSET_AVOID_OVERRUN
+
 	/* set the length to avoid overrun */
 	rc = ber_set_option( ber, LBER_OPT_REMAINING_BYTES, &len );
 	if( rc != LBER_OPT_SUCCESS ) {
@@ -72,7 +69,13 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 		ber_free( ber, 0 );
 		return NULL;
 	}
-#endif
+
+	if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+		assert( len == 0 );
+		ber_free( ber, 0 );
+		return NULL;
+	}
+	assert( len != 0 );
 
 	/* snatch the first attribute */
 	tag = ber_scanf( ber, "{ax}", &attr );
@@ -93,18 +96,20 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 	ber_tag_t tag;
 	char *attr;
 
+#ifdef NEW_LOGGING
+	LDAP_LOG ( OPERATION, ENTRY, "ldap_next_attribute\n", 0, 0, 0 );
+#else
 	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+#endif
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
 	assert( ber != NULL );
 
-#if LDAP_SEQORSET_BAILOUT
 	if ( ber_pvt_ber_remaining( ber ) == 0 ) {
 		return NULL;
 	}
-#endif
 
 	/* skip sequence, snarf attribute type, skip values */
 	tag = ber_scanf( ber, "{ax}", &attr );