Merged LDAPworldCurrent (P1-10,13,15,16,19-22)

[openldap] / libraries / libldap / abandon.c

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 18324260bd0f06edea8dfb01814772a6c474e2d6..377beb7eb302f515616562376877bd938b3539ff 100644 (file)
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -107,7 +107,7 @@ do_abandon( LDAP *ld, int origid, int msgid )
        err = 0;
        if ( sendabandon ) {
                /* create a message to send */
-               if ( (ber = alloc_ber_with_options( ld )) == NULLBER ) {
+               if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
                        err = -1;
                        ld->ld_errno = LDAP_NO_MEMORY;
                } else {
@@ -151,10 +151,10 @@ do_abandon( LDAP *ld, int origid, int msgid )
 #ifdef LDAP_REFERRALS
        if ( lr != NULL ) {
                if ( sendabandon ) {
-                       free_connection( ld, lr->lr_conn, 0, 1 );
+                       ldap_free_connection( ld, lr->lr_conn, 0, 1 );
                }
                if ( origid == msgid ) {
-                       free_request( ld, lr );
+                       ldap_free_request( ld, lr );
                }
        }
 #endif /* LDAP_REFERRALS */