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
8d677059
Commit
8d677059
authored
Sep 03, 2008
by
Quanah Gibson-Mount
Browse files
ITS#5665
parent
da88132c
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
8d677059
...
...
@@ -19,6 +19,7 @@ OpenLDAP 2.4.12 Engineering
Fixed slapd-sql fault on NULL fields (ITS#5653)
Fixed slapo-constraint string termination (ITS#5609)
Fixed slapo-memberof internal operations DN (ITS#5622)
Fixed slapo-pcache attrset crash (ITS#5665)
Fixed slapo-rwm callback cleanup (ITS#5601)
Fixed slapo-rwm attr mapping and merging (ITS#5624)
Fixed slapo-rwm objectClass filtering (ITS#5647)
...
...
servers/slapd/overlays/pcache.c
View file @
8d677059
...
...
@@ -1593,6 +1593,7 @@ struct search_info {
Query
query
;
QueryTemplate
*
qtemp
;
AttributeName
*
save_attrs
;
/* original attributes, saved for response */
int
swap_saved_attrs
;
int
max
;
int
over
;
int
count
;
...
...
@@ -1984,7 +1985,7 @@ pcache_op_cleanup( Operation *op, SlapReply *rs ) {
if
(
rs
->
sr_type
==
REP_RESULT
||
op
->
o_abandon
||
rs
->
sr_err
==
SLAPD_ABANDON
)
{
if
(
si
->
save_attrs
!=
NULL
)
{
if
(
si
->
swap_
save
d
_attrs
)
{
rs
->
sr_attrs
=
si
->
save_attrs
;
op
->
ors_attrs
=
si
->
save_attrs
;
}
...
...
@@ -2067,7 +2068,7 @@ pcache_response(
{
struct
search_info
*
si
=
op
->
o_callback
->
sc_private
;
if
(
si
->
save_attrs
!=
NULL
)
{
if
(
si
->
swap_
save
d
_attrs
)
{
rs
->
sr_attrs
=
si
->
save_attrs
;
op
->
ors_attrs
=
si
->
save_attrs
;
}
...
...
@@ -2164,7 +2165,7 @@ add_filter_attrs(
}
BER_BVZERO
(
&
(
*
new_attrs
)[
j
].
an_name
);
return
count
;
return
j
;
}
/* NOTE: this is a quick workaround to let pcache minimally interact
...
...
@@ -2416,6 +2417,7 @@ pcache_op_search(
}
si
->
head
=
NULL
;
si
->
tail
=
NULL
;
si
->
swap_saved_attrs
=
1
;
si
->
save_attrs
=
op
->
ors_attrs
;
op
->
ors_attrs
=
qtemp
->
t_attrs
.
attrs
;
...
...
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