extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-12 08:58:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

* ActiveDirectory: consider security local groups as groups too

Browse Source
This commit is contained in:
Ralf Becker 2020-05-13 13:15:50 +02:00
parent f23b5aee82
commit 46a3818e92
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/Accounts/Ads.php
View File

@ -1036,10 +1036,13 @@ class Ads
$type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')'; $type_filter = '(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')';
break; break;
case 'g': case 'g':
$type_filter = '(samaccounttype='.adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP.')'; $type_filter = '(|(samaccounttype='.adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP.
')(samaccounttype='.adLDAP::ADLDAP_SECURITY_LOCAL_GROUP.'))';
break; break;
default: default:
$type_filter = '(|(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.')(samaccounttype='.adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP.'))'; $type_filter = '(|(samaccounttype='.adLDAP::ADLDAP_NORMAL_ACCOUNT.
')(samaccounttype='.adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP.
')(samaccounttype='.adLDAP::ADLDAP_SECURITY_LOCAL_GROUP.'))';
break; break;
} }
if (!$attr_filter) if (!$attr_filter)
@ -1078,7 +1081,8 @@ class Ads
if ($key === 'count') continue; if ($key === 'count') continue;
if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT || if ($account_type && !($account_type == 'u' && $data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ||
$account_type == 'g' && $data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP)) $account_type == 'g' && in_array($data['samaccounttype'][0],
[adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, adLDAP::ADLDAP_SECURITY_LOCAL_GROUP])))
{ {
continue; continue;
} }
@ -1089,7 +1093,7 @@ class Ads
{ {
continue; // ignore system accounts incl. "Administrator" continue; // ignore system accounts incl. "Administrator"
} }
$accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP ? '-' : '').$rid] = $accounts[($data['samaccounttype'][0] == adLDAP::ADLDAP_NORMAL_ACCOUNT ? '' : '-').$rid] =
$attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8'); $attrs ? $data : Api\Translation::convert($data['samaccountname'][0], 'utf-8');
} }
} }