[checkmk-commits] 5405 FIX LDAP: Removed missleading and confusing "No persistent connection " option

Module: check_mk Branch: master Commit: 8ed4bad9edbd583a02fbd1127c769f7830a87e19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ed4bad9edbd58… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Oct 24 07:51:04 2017 +0200 5405 FIX LDAP: Removed missleading and confusing "No persistent connection" option The LDAP connector had an option to tell it that the connection to the LDAP server should not be reused. This made the connector reconnect to the LDAP server for each LDAP query. Because enabling this option can result in a much longer synchronization run, the option has now been dropped. Change-Id: Ibf7524bc3038979cc8c67a29f468bac13eb2fafe --- .bugs/3001 | 6 ++++-- .werks/5405 | 15 +++++++++++++++ web/htdocs/wato.py | 8 +------- web/plugins/userdb/ldap.py | 1 - 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.bugs/3001 b/.bugs/3001 index f8ee93e..fd326cf 100644 --- a/.bugs/3001 +++ b/.bugs/3001 @@ -1,7 +1,9 @@ Title: Agent encryption rule edit dosn't mark bakery dirty Component: wato -State: open +Class: bug +State: done Date: 2017-10-20 09:37:10 Targetversion: 1.4.0 -Class: bug + +2017-10-24 07:45:59: changed state open -> done diff --git a/.werks/5405 b/.werks/5405 new file mode 100644 index 0000000..3c529a6 --- /dev/null +++ b/.werks/5405 @@ -0,0 +1,15 @@ +Title: LDAP: Removed missleading and confusing "No persistent connection" option +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1508824163 +Class: fix + +The LDAP connector had an option to tell it that the connection to the LDAP server +should not be reused. This made the connector reconnect to the LDAP server for each +LDAP query. + +Because enabling this option can result in a much longer synchronization run, the +option has now been dropped. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0ed0a55..1243d97 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6254,12 +6254,6 @@ def vs_ldap_connection(new, connection_id): value = True, totext = _("Encrypt the network connection using SSL."), )), - ("no_persistent", FixedValue( - title = _("No persistent connection"), - help = _("The connection to the LDAP server is not persisted."), - value = True, - totext = _("Don't use persistent LDAP connections."), - )), ("connect_timeout", Float( title = _("Connect Timeout"), help = _("Timeout for the initial connection to the LDAP server in seconds."), @@ -6473,7 +6467,7 @@ def vs_ldap_connection(new, connection_id): render = "form", form_narrow = True, optional_keys = [ - 'no_persistent', 'port', 'use_ssl', 'bind', 'page_size', 'response_timeout', 'failover_servers', + 'port', 'use_ssl', 'bind', 'page_size', 'response_timeout', 'failover_servers', 'user_filter', 'user_filter_group', 'user_id', 'lower_user_ids', 'connect_timeout', 'version', 'group_filter', 'group_member', 'suffix', ], diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index ee40b24..6b24b30 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -264,7 +264,6 @@ class LDAPUserConnector(UserConnector): connection_id = self.id() if not enforce_new \ - and not "no_persistent" in self._config \ and self._ldap_obj \ and self._config == self._ldap_obj_config: self._logger.debug('LDAP CONNECT - Using existing connecting')