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

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 033914e899..8c348a1552 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -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;
@@ -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;
@@ -1010,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 );
 	}
@@ -1024,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 );