X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Frequest.c;h=cb645b18a7dc9a3ab4529ace7461a31e74ac09df;hb=8da110a9e726dbc612b302feafe0109271e6bc59;hp=ec6ee54274d614c5a19e3aa925e6bb77068591e6;hpb=e5ebc553ac1fc7adf6fdea9a3b8918967eba2231;p=openldap

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index ec6ee54274..cb645b18a7 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -419,7 +419,7 @@ ldap_free_connection( LDAP *ld, LDAPConn *lc, int force, int unbind )
 		if( lc->lconn_rebind_queue != NULL) {
 			int i;
 			for( i = 0; lc->lconn_rebind_queue[i] != NULL; i++) {
-				free_strarray(lc->lconn_rebind_queue[i]);
+				LDAP_VFREE(lc->lconn_rebind_queue[i]);
 			}
 			LDAP_FREE( lc->lconn_rebind_queue);
 		}
@@ -723,7 +723,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, char **errstrp,
 
 			if( lc->lconn_rebind_queue != NULL) {
 				/* Release resources of previous list */
-				free_strarray(refarray);
+				LDAP_VFREE(refarray);
 				refarray = NULL;
 				ldap_free_urllist(srv);
 				srv = NULL;
@@ -747,7 +747,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, char **errstrp,
 		}
 	} /* end for loop */
 done:
-	free_strarray(refarray);
+	LDAP_VFREE(refarray);
 	ldap_free_urllist(srv);
 	LDAP_FREE( *errstrp );
 	
@@ -885,7 +885,7 @@ ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp )
 				*ports++ = '\0';
 				srv->lud_port = atoi( ports );
 			} else {
-				srv->lud_port = ldap_int_global_options.ldo_defport;
+				srv->lud_port = (LDAP_INT_GLOBAL_OPT())->ldo_defport;
 			}
 
 		rinfo.ri_msgid = origreq->lr_origid;