Sync with 2.x

[openldap] / libraries / libldap / references.c

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 4ec4d91bb60e84a74789c42bb75c53c8c9ad0d31..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,7 +13,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -105,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;
@@ -131,7 +131,7 @@ free_and_return:
                *referralsp = refs;
 
        } else {
-               ldap_value_free( refs );
+               LDAP_VFREE( refs );
        }
 
        if( freeit ) {