[checkmk-commits] Check_MK Git: check_mk: FIX Fixed syntax error in exception handler of LDAP search code

Module: check_mk Branch: master Commit: a8d162b91c6fd94048a30bfbc25f13d60f6e130d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8d162b91c6fd9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 17 09:21:00 2013 +0100 FIX Fixed syntax error in exception handler of LDAP search code The exceptions are generated correctly now to show the real error message. --- .werks/374 | 10 ++++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/374 b/.werks/374 new file mode 100644 index 0000000..8bd910f --- /dev/null +++ b/.werks/374 @@ -0,0 +1,10 @@ +Title: Fixed syntax error in exception handler of LDAP search code +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1387268423 +Targetversion: future + +The exceptions are generated correctly now to show the real error message. diff --git a/ChangeLog b/ChangeLog index 4b77afe..6ca7559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,7 @@ * 0333 FIX: Fixed too long page title during performing several actions... * 0356 FIX: Fixed exception caused by utf8 chars in tooltip text... * 0368 FIX: Generating selection id is hopefully now compatible to more systems... + * 0374 FIX: Fixed syntax error in exception handler of LDAP search code... WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 3f3bed2..bf14356 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -363,8 +363,8 @@ def ldap_search(base, filt = '(objectclass=*)', columns = [], scope = None): raise MKLDAPException(_('Unable to successfully perform the LDAP search ' '(Base: %s, Scope: %s, Filter: %s, Columns: %s): %s') % (html.attrencode(base), html.attrencode(scope), - html.attrencode(filt), html.attrencode(','.join(columns))), - last_exc) + html.attrencode(filt), html.attrencode(','.join(columns)), + last_exc)) else: raise MKLDAPException(_('Unable to successfully perform the LDAP search (%s)') % last_exc)