Auth/Groups: Prefer the domain from the LDAP/MSAD user backend

If a LDAP/MSAD user group backend is linked w/ a user backend, the domain from the user backend is preferred over the domain configured for the user group backend.
This commit is contained in:
Eric Lippmann 2017-07-11 17:09:24 +02:00
parent 4b11afe7d5
commit b13c38b65b
1 changed files with 3 additions and 2 deletions

View File

@ -781,7 +781,8 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
'user_base_dn' => $userBackend->getBaseDn(),
'user_class' => $userBackend->getUserClass(),
'user_name_attribute' => $userBackend->getUserNameAttribute(),
'user_filter' => $userBackend->getFilter()
'user_filter' => $userBackend->getFilter(),
'domain' => $userBackend->getDomain()
));
}
@ -796,7 +797,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
->setGroupFilter($config->group_filter)
->setUserFilter($config->user_filter)
->setNestedGroupSearch((bool) $config->get('nested_group_search', $defaults->nested_group_search))
->setDomain($config->domain);
->setDomain($defaults->get('domain', $config->domain));
}
/**