parent
e0469d0013
commit
a55f233e9f
|
@ -201,9 +201,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
}
|
}
|
||||||
$groups = $this->access->groupsMatchFilter($groups);
|
$groups = $this->access->groupsMatchFilter($groups);
|
||||||
$allGroups = $groups;
|
$allGroups = $groups;
|
||||||
foreach ($groups as $group) {
|
|
||||||
$nestedGroups = $this->access->connection->ldapNestedGroups;
|
$nestedGroups = $this->access->connection->ldapNestedGroups;
|
||||||
if (!empty($nestedGroups)) {
|
if (intval($nestedGroups) === 1) {
|
||||||
|
foreach ($groups as $group) {
|
||||||
$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
|
$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
|
||||||
$allGroups = array_merge($allGroups, $subGroups);
|
$allGroups = array_merge($allGroups, $subGroups);
|
||||||
}
|
}
|
||||||
|
@ -408,7 +408,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
|
&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
|
||||||
) {
|
) {
|
||||||
$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
|
$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
|
||||||
|
|
||||||
if (is_array($groupDNs)) {
|
if (is_array($groupDNs)) {
|
||||||
foreach ($groupDNs as $dn) {
|
foreach ($groupDNs as $dn) {
|
||||||
$groups[] = $this->access->dn2groupname($dn);
|
$groups[] = $this->access->dn2groupname($dn);
|
||||||
|
|
Loading…
Reference in New Issue