getbyname/getbyaddr should share mutex per ITS#563.

[openldap] / libraries / libldap / getattr.c

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 3155b45d3e3d1a2b3adc693974425a69b8b1696f..9a511ee2eae23d2571b4ede57c0d55268e44edca 100644 (file)
--- 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
@@ -12,7 +13,7 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
 #include <ac/ctype.h>
 #include <ac/socket.h>
@@ -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 ) {