mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-21 23:29:34 -05:00
do not alter ld_nextref_proc (ITS#6602)
This commit is contained in:
parent
0480296a1f
commit
6c6e187b98
1 changed files with 4 additions and 6 deletions
|
|
@ -1044,6 +1044,7 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
|
||||||
LDAPConn *lc;
|
LDAPConn *lc;
|
||||||
int rc, count, i, j, id;
|
int rc, count, i, j, id;
|
||||||
LDAPreqinfo rinfo;
|
LDAPreqinfo rinfo;
|
||||||
|
LDAP_NEXTREF_PROC *nextref_proc = ld->ld_nextref_proc ? ld->ld_nextref_proc : ldap_int_nextref;
|
||||||
|
|
||||||
ld->ld_errno = LDAP_SUCCESS; /* optimistic */
|
ld->ld_errno = LDAP_SUCCESS; /* optimistic */
|
||||||
*hadrefp = 0;
|
*hadrefp = 0;
|
||||||
|
|
@ -1079,15 +1080,12 @@ ldap_chase_v3referrals( LDAP *ld, LDAPRequest *lr, char **refs, int sref, char *
|
||||||
refarray = refs;
|
refarray = refs;
|
||||||
refs = NULL;
|
refs = NULL;
|
||||||
|
|
||||||
if ( ld->ld_nextref_proc == NULL ) {
|
|
||||||
ld->ld_nextref_proc = ldap_int_nextref;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* parse out & follow referrals */
|
/* parse out & follow referrals */
|
||||||
|
/* NOTE: if nextref_proc == ldap_int_nextref, params is ignored */
|
||||||
i = -1;
|
i = -1;
|
||||||
for ( ld->ld_nextref_proc( ld, &refarray, &i, ld->ld_nextref_params );
|
for ( nextref_proc( ld, &refarray, &i, ld->ld_nextref_params );
|
||||||
i != -1;
|
i != -1;
|
||||||
ld->ld_nextref_proc( ld, &refarray, &i, ld->ld_nextref_params ) )
|
nextref_proc( ld, &refarray, &i, ld->ld_nextref_params ) )
|
||||||
{
|
{
|
||||||
|
|
||||||
/* Parse the referral URL */
|
/* Parse the referral URL */
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue