Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
7ab4a41a
Commit
7ab4a41a
authored
Jan 21, 2009
by
Quanah Gibson-Mount
Browse files
ITS#5889
parent
b017dc9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
7ab4a41a
...
...
@@ -23,6 +23,7 @@ OpenLDAP 2.4.14 Engineering
Fixed slapd-ldif rename on same DN (ITS#5319)
Fixed slapd-ldif deadlock (ITS#5329)
Fixed slapd-meta double response sending (ITS#5854)
Fixed slapd-meta alias deref for retry (ITS#5889)
Fixed slapo-ppolicy to not be global (ITS#5858)
Updated contrib/addpartial module (ITS#5764)
Added contrib/cloak module (ITS#5872)
...
...
servers/slapd/back-meta/search.c
View file @
7ab4a41a
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment