Module: check_mk
Branch: master
Commit: 6dd78ca0453c5f920dadfed9e1d4f5f0bf098b21
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6dd78ca0453c5f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Dec 17 10:11:21 2013 +0100
FIX LDAP: Default configuration of attributes is reflected within WATO now
---
.werks/376 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/config/builtin.py | 4 +++-
web/plugins/wato/check_mk_configuration.py | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/.werks/376 b/.werks/376
new file mode 100644
index 0000000..42f1cc6
--- /dev/null
+++ b/.werks/376
@@ -0,0 +1,10 @@
+Title: LDAP: Default configuration of attributes is reflected within WATO now
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1387271448
+Targetversion: future
+
+
diff --git a/ChangeLog b/ChangeLog
index b89185e..f228f00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -74,6 +74,7 @@
* 0332 FIX: Own host tag groups without topics resulted in two groups "Host
tags" in the rule editor
* 0361 FIX: The page linked by "new rule" can now be bookmarked again
* 0341 FIX: Avoid rare exception in WATO when deleting a host...
+ * 0376 FIX: LDAP: Default configuration of attributes is reflected within WATO now
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
diff --git a/web/plugins/config/builtin.py b/web/plugins/config/builtin.py
index fd285d8..bec88d0 100644
--- a/web/plugins/config/builtin.py
+++ b/web/plugins/config/builtin.py
@@ -219,7 +219,9 @@ ldap_userspec = {
'scope' : 'sub',
'user_id_umlauts' : 'replace',
}
-ldap_groupspec = {}
+ldap_groupspec = {
+ 'scope' : 'sub',
+}
ldap_active_plugins = {'email': {}, 'alias': {}, 'auth_expire':
{}}
ldap_cache_livetime = 300
ldap_debug_log = None
diff --git a/web/plugins/wato/check_mk_configuration.py
b/web/plugins/wato/check_mk_configuration.py
index 5ffabb5..f7b0a1a 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -759,7 +759,7 @@ register_configvar(group,
attrencode = True,
)),
],
- optional_keys = ['scope', 'filter', 'member'],
+ optional_keys = ['filter', 'member'],
),
domain = "multisite",
in_global_settings = False,