Module: check_mk Branch: master Commit: 04d5a0b1c6d34e4c4e1fcc55d3698fb12b288981 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04d5a0b1c6d34e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 22 16:21:04 2013 +0200 FIX: LDAP configuration: allow DNs without DC= --- ChangeLog | 7 ++++--- web/htdocs/valuespec.py | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ebc35f..58e4ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,7 @@ WATO: * FIX: convert editing of global setting to POST. This avoid URL-too-long when defining lots of Event Console actions + * FIX: LDAP configuration: allow DNs without DC= Event Console: * FIX: fix icon in events check if host specification is by IP address @@ -288,7 +289,7 @@ user/kernel percentages. (thanks to William Baum) * FIX: UPS checks support Eaton Evolution * FIX: windows agent plugin: mssql now exits after 10 seconds - + Notifications: * FIX: fixed crash on host notification when contact had explicit services set @@ -302,12 +303,12 @@ Multisite: * FIX: Avoid duplicate "Services" button in host detail views * FIX: fix rescheduling icon for services with non-ASCII characters - * New filter for IP address of a host + * New filter for IP address of a host * Quicksearch: allow searching for complete IP addresses and IP address prefixes * Add logentry class filter to view 'Host- and Service events' - BI: + BI: * FIX: fix exception with expansion level being 'None' * FIX: speedup for single host tables joined by hostname (BI-Boxes) * FIX: avoid closing BI subtree while tree is being loaded diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 84c0c99..a3866cb 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -2340,10 +2340,6 @@ class LDAPDistinguishedName(TextAscii): def validate_value(self, value, varprefix): TextAscii.validate_value(self, value, varprefix) - # At least one DC= must be in distinguished name - if value and 'dc=' not in value.lower(): - raise MKUserError(varprefix, _('Found no "dc=" (Domain Component).')) - # Check wether or not the given DN is below a base DN if self.enforce_suffix and value and not value.lower().endswith(self.enforce_suffix.lower()): raise MKUserError(varprefix, _('Does not ends with "%s".') % self.enforce_suffix)