Module: check_mk
Branch: master
Commit: 88afff0e28a3a7d9f0a149c8504a42538118ea5e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=88afff0e28a3a7…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 20 12:00:34 2017 +0200
5002 FIX Fixed possible exception related to multisite_user_connectors on login failures
Change-Id: Ic7e14061fc221d700e0587eb31e21c408a990f7d
---
.werks/5002 | 11 +++++++++++
web/htdocs/userdb.py | 9 ++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/.werks/5002 b/.werks/5002
new file mode 100644
index 0000000..f57c486
--- /dev/null
+++ b/.werks/5002
@@ -0,0 +1,11 @@
+Title: Fixed possible exception related to multisite_user_connectors on login failures
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+Edition: cre
+State: unknown
+Version: 1.5.0i1
+Date: 1500544809
+
+
diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py
index 5cdb5c8..46d9895 100644
--- a/web/htdocs/userdb.py
+++ b/web/htdocs/userdb.py
@@ -45,6 +45,9 @@ connection_dict = {}
g_connections = {}
auth_logger = logger.getChild("auth")
+# declare lobal vars
+multisite_user_connectors = {}
+
# Load all userdb plugins
def load_plugins(force):
global user_attributes
@@ -69,9 +72,9 @@ def load_plugins(force):
if loaded_with_language == current_language and not force:
return
- # declare & initialize global vars
- user_attributes = {}
- multisite_user_connectors = {}
+ # clear global vars
+ user_attributes.clear()
+ multisite_user_connectors.clear()
load_web_plugins("userdb", globals())
builtin_user_attribute_names = user_attributes.keys()