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

[openldap] / libraries / libldap / cldap.c

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index 19782f77d898a18ac23f97c874b055fcf393ea1e..806a6ce91c83f8b79c7a40535e4700dd1a269ff3 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -170,7 +170,7 @@ cldap_open( char *host, int port )
 
     if ( ld->ld_sb.sb_addrs == NULL
 #ifdef LDAP_REFERRALS
-           || ( ld->ld_defconn = new_connection( ld, NULL, 1,0,0 )) == NULL
+           || ( ld->ld_defconn = ldap_new_connection( ld, NULL, 1,0,0 )) == NULL
 #endif /* LDAP_REFERRALS */
            ) {
        free( ld );
@@ -316,7 +316,7 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
            "cldap_result waiting up to %d seconds for a response\n",
            tv.tv_sec, 0, 0 );
     ber_init( &ber, 0 );
-    set_ber_options( ld, &ber );
+    ldap_set_ber_options( ld, &ber );
 
     if ( cldap_getmsg( ld, &tv, &ber ) == -1 ) {
        ret = ld->ld_errno;
@@ -432,7 +432,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
            tag != LBER_DEFAULT && rc != LDAP_SUCCESS;
            tag = ber_next_element( ber, &len, cookie )) {
        if (( ldm = (LDAPMessage *)calloc( 1, sizeof(LDAPMessage)))
-               == NULL || ( ldm->lm_ber = alloc_ber_with_options( ld ))
+               == NULL || ( ldm->lm_ber = ldap_alloc_ber_with_options( ld ))
                == NULLBER ) {
            rc = LDAP_NO_MEMORY;
            break;      /* return w/error*/
@@ -506,7 +506,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
 #ifndef NO_CACHE
            if ( ld->ld_cache != NULL ) {
-               add_result_to_cache( ld, ldm );
+               ldap_add_result_to_cache( ld, ldm );
            }
 #endif /* NO_CACHE */