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
7cfceb21
Commit
7cfceb21
authored
Jan 03, 2011
by
Quanah Gibson-Mount
Browse files
ITS#6712
parent
9f2ace48
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGES
View file @
7cfceb21
...
...
@@ -26,6 +26,7 @@ OpenLDAP 2.4.24 Engineering
Fixed slapd modify to return actual error (ITS#6581)
Fixed slapd sortvals of attributes with 1 value (ITS#6715)
Fixed slapd syncrepl reuse of presence list (ITS#6707)
Fixed slapd-bdb hasSubordinates generation (ITS#6712)
Fixed slapd-bdb entry cache delete failure (ITS#6577)
Fixed slapd-bdb error propogation to overlays (ITS#6633)
Fixed slapd-ldap debug output of timeout (ITS#6721)
...
...
@@ -34,11 +35,14 @@ OpenLDAP 2.4.24 Engineering
Fixed slapd-ldap chaining with ppolicy (ITS#6540)
Fixed slapd-ldap with SASL/EXTERNAL (ITS#6642)
Fixed slapd-ndb to honor rootpw setting (ITS#6661)
Fixed slapd-ndb hasSubordinates generation (ITS#6712)
Fixed slapd-meta anon retry with failed auth method (ITS#6643)
Fixed slapd-meta rebind proc (ITS#6665)
Fixed slapd-meta to correctly rebind as user (ITS#6574)
Fixed slapd-meta with SASL/EXTERNAL (ITS#6642)
Fixed slapd-monitor hasSubordinates generation (ITS#6712)
Fixed slapd-sql with null objectClass (ITS#6616)
Fixed slapd-sql hasSubordinates generation (ITS#6712)
Fixed slapo-pcache callback freeing (ITS#6640)
Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
...
...
servers/slapd/back-bdb/operational.c
View file @
7cfceb21
...
...
@@ -124,11 +124,16 @@ bdb_operational(
assert
(
rs
->
sr_entry
!=
NULL
);
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
/* just count */
;
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
if
(
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_hasSubordinates
)
{
break
;
}
}
if
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
if
(
*
ap
==
NULL
&&
attr_find
(
rs
->
sr_entry
->
e_attrs
,
slap_schema
.
si_ad_hasSubordinates
)
==
NULL
&&
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
)
{
int
hasSubordinates
,
rc
;
...
...
servers/slapd/back-monitor/operational.c
View file @
7cfceb21
...
...
@@ -43,11 +43,16 @@ monitor_back_operational(
assert
(
rs
->
sr_entry
!=
NULL
);
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
/* just count */
;
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
if
(
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_hasSubordinates
)
{
break
;
}
}
if
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
if
(
*
ap
==
NULL
&&
attr_find
(
rs
->
sr_entry
->
e_attrs
,
slap_schema
.
si_ad_hasSubordinates
)
==
NULL
&&
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
)
{
int
hs
;
monitor_entry_t
*
mp
;
...
...
servers/slapd/back-ndb/search.cpp
View file @
7cfceb21
...
...
@@ -826,11 +826,16 @@ ndb_operational(
assert
(
rs
->
sr_entry
!=
NULL
);
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
/* just count */
;
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
if
(
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_hasSubordinates
)
{
break
;
}
}
if
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
if
(
*
ap
==
NULL
&&
attr_find
(
rs
->
sr_entry
->
e_attrs
,
slap_schema
.
si_ad_hasSubordinates
)
==
NULL
&&
(
SLAP_OPATTRS
(
rs
->
sr_attr_flags
)
||
ad_inlist
(
slap_schema
.
si_ad_hasSubordinates
,
rs
->
sr_attrs
)
)
)
{
int
hasSubordinates
,
rc
;
...
...
servers/slapd/back-sql/operational.c
View file @
7cfceb21
...
...
@@ -123,7 +123,7 @@ backsql_operational(
Debug
(
LDAP_DEBUG_TRACE
,
"==>backsql_operational(): entry
\"
%s
\"\n
"
,
rs
->
sr_entry
->
e_nname
.
bv_val
,
0
,
0
);
for
(
ap
=
&
rs
->
sr_
operational
_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
for
(
ap
=
&
rs
->
sr_
entry
->
e
_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
if
(
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_hasSubordinates
)
{
get_conn
--
;
got
[
BACKSQL_OP_HASSUBORDINATES
]
=
1
;
...
...
@@ -138,6 +138,27 @@ backsql_operational(
}
}
for
(
ap
=
&
rs
->
sr_operational_attrs
;
*
ap
;
ap
=
&
(
*
ap
)
->
a_next
)
{
if
(
!
got
[
BACKSQL_OP_HASSUBORDINATES
]
&&
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_hasSubordinates
)
{
get_conn
--
;
got
[
BACKSQL_OP_HASSUBORDINATES
]
=
1
;
}
else
if
(
!
got
[
BACKSQL_OP_ENTRYUUID
]
&&
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_entryUUID
)
{
get_conn
--
;
got
[
BACKSQL_OP_ENTRYUUID
]
=
1
;
}
else
if
(
!
got
[
BACKSQL_OP_ENTRYCSN
]
&&
(
*
ap
)
->
a_desc
==
slap_schema
.
si_ad_entryCSN
)
{
get_conn
--
;
got
[
BACKSQL_OP_ENTRYCSN
]
=
1
;
}
}
if
(
!
get_conn
)
{
return
0
;
}
...
...
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