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

Merge branch 'bugfix/ldap-user-groups-backend-group_filter-11142'

Browse Source 
fixes #11142
This commit is contained in:
Alexander A. Klimov 2016-02-11 16:36:13 +01:00
commit fc30af806b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/installation.md
View File

@ -501,4 +501,6 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
## <a id="upgrading-to-2.1.x"></a> Upgrading to Icinga Web 2 2.1.x ## <a id="upgrading-to-2.1.x"></a> Upgrading to Icinga Web 2 2.1.x
Icinga Web 2 2.1.x does not introduce any backward incompatible change. * Since Icinga Web 2 version 2.1.3 LDAP user group backends respect the configuration option `group_filter`.
Users who changed the configuration manually and used the option `filter` instead
have to change it back to `group_filter`.

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

@ -705,7 +705,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute)) ->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute))
->setUserNameAttribute($config->get('user_name_attribute', $defaults->user_name_attribute)) ->setUserNameAttribute($config->get('user_name_attribute', $defaults->user_name_attribute))
->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute)) ->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute))
->setGroupFilter($config->filter) ->setGroupFilter($config->group_filter)
->setUserFilter($config->user_filter); ->setUserFilter($config->user_filter);
} }