From 32876ca8aeaf4da954848e5f472d12790ebef38c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 11 Feb 2016 15:49:28 +0100 Subject: [PATCH 1/3] LdapUserGroupBackend: respect config option group_filter refs #11142 --- .../Icinga/Authentication/UserGroup/LdapUserGroupBackend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php index 8a17f6160..3f912b0ca 100644 --- a/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php +++ b/library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php @@ -705,7 +705,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt ->setGroupNameAttribute($config->get('group_name_attribute', $defaults->group_name_attribute)) ->setUserNameAttribute($config->get('user_name_attribute', $defaults->user_name_attribute)) ->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute)) - ->setGroupFilter($config->filter) + ->setGroupFilter($config->group_filter) ->setUserFilter($config->user_filter); } From 5a8c430aa5b1c21db75d29c44e8dc035d943ca45 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 11 Feb 2016 16:14:19 +0100 Subject: [PATCH 2/3] Doc: mention that LDAP user group backends respect the config option group_filter since v2.1.3 refs #11142 --- doc/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/installation.md b/doc/installation.md index 4f481dcb1..64b806391 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -501,4 +501,4 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar ## 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`. From 8a7b840369207b124f1e0c0243f01fbde97a4e7c Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Thu, 11 Feb 2016 16:33:43 +0100 Subject: [PATCH 3/3] Doc: mention what users eventually have to do while upgrading to v2.1.3 refs #11142 --- doc/installation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/installation.md b/doc/installation.md index 64b806391..57abe0dd2 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -502,3 +502,5 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar ## Upgrading to Icinga Web 2 2.1.x * 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`.