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

This reverts commit 5cb7deda20, reversing
changes made to 02391e648b.

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:
Eric Lippmann 2018-03-19 10:10:32 +01:00
parent c0e8b33b33
commit 4a000d0098
2 changed files with 0 additions and 4 deletions

View File

@ -48,7 +48,6 @@ 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>

View File

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