WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new type API

This commit is contained in:
Roland Gruber 2017-05-08 19:59:28 +02:00
parent 7b82372a2d
commit 2f5f0caff1
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lam/lib/modules/posixAccount.inc
View File

@ -2981,27 +2981,28 @@ class posixAccount extends baseModule implements passwordService {
if ($this->groupCache != null) { if ($this->groupCache != null) {
return $this->groupCache; return $this->groupCache;
} }
$typeSettings = $_SESSION['config']->get_typeSettings(); $this->groupCache = array();
$typeManager = new TypeManager();
foreach ($typeManager->getConfiguredTypesForScope('group') as $type) {
$filter = '(objectClass=posixGroup)'; $filter = '(objectClass=posixGroup)';
if ($this->isWindows()) { if ($this->isWindows()) {
$filter = '(&(objectClass=group)(gidNumber=*))'; $filter = '(&(objectClass=group)(gidNumber=*))';
} }
if (!empty($typeSettings['filter_group'])) { $typeFilter = $type->getAdditionalLdapFilter();
$typeFilter = $typeSettings['filter_group']; if (!empty($typeFilter)) {
if (strpos($typeFilter, '(') !== 0) { if (strpos($typeFilter, '(') !== 0) {
$typeFilter = '(' . $typeFilter . ')'; $typeFilter = '(' . $typeFilter . ')';
} }
$filter = '(&' . $filter . $typeFilter . ')'; $filter = '(&' . $filter . $typeFilter . ')';
} }
$results = searchLDAPByFilter($filter, array('cn', 'gidnumber'), array('group')); $results = searchLDAP($type->getSuffix(), $filter, array('cn', 'gidnumber'));
$return = array();
for ($i = 0; $i < sizeof($results); $i++) { for ($i = 0; $i < sizeof($results); $i++) {
if (isset($results[$i]['cn'][0]) && isset($results[$i]['gidnumber'][0])) { if (isset($results[$i]['cn'][0]) && isset($results[$i]['gidnumber'][0])) {
$return[] = array($results[$i]['gidnumber'][0], $results[$i]['cn'][0]); $this->groupCache[] = array($results[$i]['gidnumber'][0], $results[$i]['cn'][0]);
} }
} }
$this->groupCache = $return; }
return $return; return $this->groupCache;
} }
/** /**