X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Frequest.c;h=8c348a1552fc8eaf944ce93735e6fa4afb6e9883;hb=49d73e12a720cfe052a335d82e67994ff261d21c;hp=cabdaca6b3dc6cd4522bbf608c0049476fe7aa7f;hpb=c1117666b1e978b2bb6d3b671ed3ab1fc46a66ff;p=openldap

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index cabdaca6b3..8c348a1552 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);
 		}
@@ -578,7 +578,7 @@ ldap_free_request( LDAP *ld, LDAPRequest *lr )
  *
  * Return value - number of referrals followed
  */
-LIBLDAP_F(int)
+int
 ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, char **errstrp, int *hadrefp )
 {
 	char		*unfollowed;
@@ -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 );
 	
@@ -827,6 +827,8 @@ ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp )
 		ldap_pvt_hex_unescape( ref );
 		len = strlen( ref );
 
+		/* FIXME: we should use the URL Parser */
+
 		if ( len > LDAP_LDAP_REF_STR_LEN && strncasecmp( ref,
 		    LDAP_LDAP_REF_STR, LDAP_LDAP_REF_STR_LEN ) == 0 ) {
 			Debug( LDAP_DEBUG_TRACE,
@@ -865,6 +867,13 @@ ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp )
 				return( -1 );
 			}
 
+			if (( srv->lud_scheme = LDAP_STRDUP("ldap")) == NULL ) {
+				LDAP_FREE( (char *)srv );
+				ber_free( ber, 1 );
+				ld->ld_errno = LDAP_NO_MEMORY;
+				return( -1 );
+			}
+
 			if (( srv->lud_host = LDAP_STRDUP( tmpref )) == NULL ) {
 				LDAP_FREE( (char *)srv );
 				ber_free( ber, 1 );
@@ -876,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;
@@ -1001,7 +1010,7 @@ re_encode_request( LDAP *ld, BerElement *origber, ber_int_t msgid, char **dnp, i
 	if ( tag == LDAP_REQ_BIND ) {
 		rc = ber_printf( ber, "{it{is" /*}}*/, msgid, tag, ver, *dnp );
 	} else if ( tag == LDAP_REQ_DELETE ) {
-		rc = ber_printf( ber, "{its}", msgid, tag, *dnp );
+		rc = ber_printf( ber, "{itsN}", msgid, tag, *dnp );
 	} else {
 		rc = ber_printf( ber, "{it{s" /*}}*/, msgid, tag, *dnp );
 	}
@@ -1015,7 +1024,7 @@ re_encode_request( LDAP *ld, BerElement *origber, ber_int_t msgid, char **dnp, i
 	if ( tag != LDAP_REQ_DELETE && (
 		ber_write(ber, tmpber.ber_ptr, ( tmpber.ber_end - tmpber.ber_ptr ), 0)
 		!= ( tmpber.ber_end - tmpber.ber_ptr ) ||
-	    ber_printf( ber, /*{{*/ "}}" ) == -1 ) )
+	    ber_printf( ber, /*{{*/ "N}N}" ) == -1 ) )
 	{
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );