upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 00:29:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix alias deref in case of retry (ITS#5889)

Browse source
This commit is contained in:
Pierangelo Masarati 2009-01-21 08:55:48 +00:00
parent 9ba19d7b19
commit 549455c6c6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servers/slapd/back-meta/search.c
View file

@ -583,13 +583,6 @@ meta_back_search_start(
goto done;
}
/* should we check return values? */
if ( op->ors_deref != -1 ) {
assert( msc->msc_ld != NULL );
(void)ldap_set_option( msc->msc_ld, LDAP_OPT_DEREF,
( void * )&op->ors_deref );
}
if ( op->ors_tlimit != SLAP_NO_LIMIT ) {
tv.tv_sec = op->ors_tlimit > 0 ? op->ors_tlimit : 1;
tv.tv_usec = 0;
@ -597,6 +590,13 @@ meta_back_search_start(
}
retry:;
/* should we check return values? */
if ( op->ors_deref != -1 ) {
assert( msc->msc_ld != NULL );
(void)ldap_set_option( msc->msc_ld, LDAP_OPT_DEREF,
( void * )&op->ors_deref );
}
ctrls = op->o_ctrls;
if ( meta_back_controls_add( op, rs, *mcp, candidate, &ctrls )
!= LDAP_SUCCESS )