Sync with 2.x

[openldap] / libraries / libldap / references.c

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 50cf0fc27cd361fc0cefa6c70e2b8113daa77fd9..6a6d723356bdd161edc524303f995e1af03e9e7f 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.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
  */
 /*
@@ -12,18 +13,17 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
 #include "ldap-int.h"
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 {
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
        assert( chain !=  NULL );
 
        if ( ld == NULL || chain == NULL ) {
@@ -39,6 +39,7 @@ LDAPMessage *
 ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
        assert( ref !=  NULL );
 
        if ( ld == NULL || ref == NULL ) {
@@ -64,12 +65,14 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
        int     i;
 
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
        assert( chain !=  NULL );
 
        if ( ld == NULL ) {
                return -1;
        }
 
+       
        for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
                if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
                        i++;
@@ -92,6 +95,7 @@ ldap_parse_reference(
        int rc;
 
        assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
        assert( ref !=  NULL );
 
        if( ld == NULL || ref == NULL ||
@@ -101,7 +105,7 @@ ldap_parse_reference(
        }
 
        /* make a private copy of BerElement */
-       SAFEMEMCPY(&be, ref->lm_ber, sizeof(be));
+       AC_MEMCPY(&be, ref->lm_ber, sizeof(be));
        
        if ( ber_scanf( &be, "{v" /*}*/, &refs ) == LBER_ERROR ) {
                rc = LDAP_DECODING_ERROR;
@@ -127,7 +131,7 @@ free_and_return:
                *referralsp = refs;
 
        } else {
-               ldap_value_free( refs );
+               LDAP_VFREE( refs );
        }
 
        if( freeit ) {