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 fc4d31f56a4afea6957985a91bacf744747ac918..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
@@ -33,7 +34,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
        assert( entry != NULL );
        assert( ber != NULL );
 
-       if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+       if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                *ber = NULL;
                return( NULL );
        }
@@ -46,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 );