tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/domain-aware-auth-non-domain-ldap-group-backend-3250'

Browse Source 
fixes #3250
fixes #3251
This commit is contained in:
Alexander A. Klimov 2018-01-15 11:20:45 +01:00
commit 5cb7deda20
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -48,6 +48,7 @@ Mikko Peltokangas <mikko@peltokangas.org>
Munzir Taha <munzirtaha@gmail.com> Munzir Taha <munzirtaha@gmail.com>
Nicolai Buchwitz <nicolai.buchwitz@enda.eu> Nicolai Buchwitz <nicolai.buchwitz@enda.eu>
Noah Hilverling <noah.hilverling@icinga.com> Noah Hilverling <noah.hilverling@icinga.com>
Paolo Schiro <paolo.schiro@kpnqwest.it>
Paul Richards <paul@minimoo.org> Paul Richards <paul@minimoo.org>
Pavlos Daoglou <pdaoglou@gmail.com> Pavlos Daoglou <pdaoglou@gmail.com>
Pieter Lexis <pieter.lexis@powerdns.com> Pieter Lexis <pieter.lexis@powerdns.com>

3
library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
View File

@ -689,6 +689,9 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
$username = $user->getLocalUsername(); $username = $user->getLocalUsername();
} else { } else {
if ($user->hasDomain()) {
return array();
}
$username = $user->getUsername(); $username = $user->getUsername();
} }