From 4a000d00984f0e14c268029500479ca80e9cbfb3 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 19 Mar 2018 10:10:32 +0100 Subject: [PATCH] Revert "Merge branch 'bugfix/domain-aware-auth-non-domain-ldap-group-backend-3250'" This reverts commit 5cb7deda20c4e69a5461ec646af2fedfb3a151a0, reversing changes made to 02391e648be2f29b28ddbf7a08ebe6459a0fc6d7. 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 --- AUTHORS | 1 - .../Icinga/Authentication/UserGroup/LdapUserGroupBackend.php | 3 --- 2 files changed, 4 deletions(-) diff --git a/AUTHORS b/AUTHORS index 5617d4936..cea5b962f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -48,7 +48,6 @@ Mikko Peltokangas Munzir Taha Nicolai Buchwitz Noah Hilverling -Paolo Schiro Paul Richards Pavlos Daoglou Pieter Lexis diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php index 8acbad288..bd0835af0 100644 --- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php +++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php @@ -693,9 +693,6 @@ class LdapUserGroupBackend extends LdapRepository implements Inspectable, UserGr $username = $user->getLocalUsername(); } else { - if ($user->hasDomain()) { - return array(); - } $username = $user->getUsername(); }