[checkmk-commits] Removed useless check (ldap is always available these days)

Module: check_mk Branch: master Commit: d51babb5f5fa257ad7b8e1613373a72a31c42cae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d51babb5f5fa25… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Aug 3 07:44:53 2018 +0200 Removed useless check (ldap is always available these days) Change-Id: I830e632cd0ee5b84e1ba74959fa9521befe1d330 --- cmk/gui/plugins/userdb/ldap_connector.py | 10 ---------- cmk/gui/wato/__init__.py | 2 -- 2 files changed, 12 deletions(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index 26c5792..92f3132 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -108,14 +108,6 @@ class MKLDAPException(MKGeneralException): pass -def ldap_test_module(): - try: - ldap - except: - raise MKLDAPException(_("The python module python-ldap seems to be missing. You need to " - "install this extension to make the LDAP user connector work.")) - - #. # .--UserConnector-------------------------------------------------------. # | _ _ ____ _ | @@ -281,8 +273,6 @@ class LDAPUserConnector(UserConnector): else: self._logger.info('LDAP CONNECT - Connecting...') - ldap_test_module() - # Some major config var validations if not self._config['user_dn']: diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 474c151..681679e 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -6467,8 +6467,6 @@ class ModeLDAPConfig(LDAPMode): def page(self): - cmk.gui.plugins.userdb.ldap_connector.ldap_test_module() - table.begin() for index, connection in enumerate(userdb.load_connection_config()): table.row()