Revert "Merge branch 'bugfix/domain-aware-auth-non-domain-ldap-group-backend-3250'"
This reverts commit5cb7deda20
, reversing changes made to02391e648b
. The change must be reverted because it makes it impossible to load groups if domain aware auth is not enabled and the authenticated user specifies a domain. refs #3324
This commit is contained in:
parent
c0e8b33b33
commit
4a000d0098
1
AUTHORS
1
AUTHORS
|
@ -48,7 +48,6 @@ Mikko Peltokangas <mikko@peltokangas.org>
|
|||
Munzir Taha <munzirtaha@gmail.com>
|
||||
Nicolai Buchwitz <nicolai.buchwitz@enda.eu>
|
||||
Noah Hilverling <noah.hilverling@icinga.com>
|
||||
Paolo Schiro <paolo.schiro@kpnqwest.it>
|
||||
Paul Richards <paul@minimoo.org>
|
||||
Pavlos Daoglou <pdaoglou@gmail.com>
|
||||
Pieter Lexis <pieter.lexis@powerdns.com>
|
||||
|
|
|
@ -693,9 +693,6 @@ class LdapUserGroupBackend extends LdapRepository implements Inspectable, UserGr
|
|||
|
||||
$username = $user->getLocalUsername();
|
||||
} else {
|
||||
if ($user->hasDomain()) {
|
||||
return array();
|
||||
}
|
||||
$username = $user->getUsername();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue