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
c1912fb7
Commit
c1912fb7
authored
Oct 13, 2020
by
Howard Chu
Browse files
ITS#9121 don't process nested memberOf if memberOf wasn't requested
parent
e322ad79
Changes
1
Hide whitespace changes
Inline
Side-by-side
servers/slapd/overlays/dynlist.c
View file @
c1912fb7
...
...
@@ -1715,27 +1715,30 @@ dynlist_search( Operation *op, SlapReply *rs )
/* if attribute is not requested, skip it */
if
(
op
->
ors_attrs
==
NULL
)
{
if
(
!
dlm
->
dlm_memberOf_oper
)
if
(
!
dlm
->
dlm_memberOf_oper
)
{
want
|=
WANT_MEMBEROF
;
if
(
dlm
->
dlm_memberOf_nested
&&
!
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
if
(
dlm
->
dlm_memberOf_nested
&&
!
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
}
}
else
{
if
(
ad_inlist
(
dlm
->
dlm_memberOf_ad
,
op
->
ors_attrs
))
if
(
ad_inlist
(
dlm
->
dlm_memberOf_ad
,
op
->
ors_attrs
))
{
want
|=
WANT_MEMBEROF
;
if
(
dlm
->
dlm_memberOf_nested
&&
ad_inlist
(
dlm
->
dlm_member_ad
,
op
->
ors_attrs
))
{
want
|=
WANT_MEMBER
;
if
(
dlm
->
dlm_memberOf_nested
&&
ad_inlist
(
dlm
->
dlm_member_ad
,
op
->
ors_attrs
))
want
|=
WANT_MEMBER
;
}
else
{
if
(
opattrs
)
{
if
(
dlm
->
dlm_memberOf_oper
)
if
(
dlm
->
dlm_memberOf_oper
)
{
want
|=
WANT_MEMBEROF
;
if
(
dlm
->
dlm_memberOf_nested
&&
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
if
(
dlm
->
dlm_memberOf_nested
&&
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
}
}
if
(
userattrs
)
{
if
(
!
dlm
->
dlm_memberOf_oper
)
if
(
!
dlm
->
dlm_memberOf_oper
)
{
want
|=
WANT_MEMBEROF
;
if
(
dlm
->
dlm_memberOf_nested
&&
!
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
if
(
dlm
->
dlm_memberOf_nested
&&
!
dlm
->
dlm_member_oper
)
want
|=
WANT_MEMBER
;
}
}
}
}
...
...
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