X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetattr.c;h=9a511ee2eae23d2571b4ede57c0d55268e44edca;hb=7573a81efea63bc0e07d88ba4c9b6973d51d857d;hp=5a6d77066e1ea066de1ad81779743960f18763a2;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 5a6d77066e..9a511ee2ea 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -26,13 +27,14 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
 {
 	char *attr;
 
+	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+
 	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
 	assert( ber != NULL );
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
-
-	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+	if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
 		*ber = NULL;
 		return( NULL );
 	}
@@ -45,7 +47,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
 	 * positioned right before the next attribute type/value sequence.
 	 */
 
-	if ( ber_scanf( *ber, "{x{{ax}", &attr )
+	if ( ber_scanf( *ber, "{x{{ax}" /*}}*/, &attr )
 	    == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		ber_free( *ber, 0 );
@@ -62,12 +64,13 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 {
 	char *attr;
 
+	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+
 	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
 	assert( entry != NULL );
 	assert( ber != NULL );
 
-	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
-
 	/* skip sequence, snarf attribute type, skip values */
 	if ( ber_scanf( ber, "{ax}", &attr ) 
 	    == LBER_ERROR ) {