Module: check_mk
Branch: master
Commit: 6d8f4c3ad52e0e6e764b39f63381851e564a7571
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d8f4c3ad52e0e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Apr 16 14:08:39 2013 +0200
FIX: do not remove directories of non-exisant users anymore
Conflicts:
ChangeLog
---
ChangeLog | 5 +++++
web/htdocs/userdb.py | 17 ++++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a920e57..ebf450e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,11 @@
* FIX: check_mk_agent.aix: fix shebang: was python, must be ksh
* FIX: cisco_qos: Be compatible to newer IOS-XE versions (Thanks to Ken Smith)
+ Multisite:
+ * FIX: do not remove directories of non-exisant users anymore. This lead to
+ a deletion of users' settings in case of an external authentication
+ (like mod_ldap).
+
1.2.2:
Core:
* Added $HOSTURL$ and $SERVICEURL$ to notification macros which contain an
diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py
index 2d2853a..2dfd104 100644
--- a/web/htdocs/userdb.py
+++ b/web/htdocs/userdb.py
@@ -347,13 +347,16 @@ def save_users(profiles):
serial_file = user_dir + '/serial.mk'
create_user_file(serial_file, 'w').write('%d\n' %
user.get('serial', 0))
- # Remove settings directories of non-existant users
- dir = defaults.var_dir + "/web"
- for e in os.listdir(dir):
- if e not in ['.', '..'] and e not in profiles:
- entry = dir + "/" + e
- if os.path.isdir(entry):
- shutil.rmtree(entry)
+ # Remove settings directories of non-existant users.
+ # Beware: we removed this since it leads to violent destructions
+ # if the user database is out of the scope of Check_MK. This is
+ # e.g. the case, if mod_ldap is used for user authentication.
+ # dir = defaults.var_dir + "/web"
+ # for e in os.listdir(dir):
+ # if e not in ['.', '..'] and e not in profiles:
+ # entry = dir + "/" + e
+ # if os.path.isdir(entry):
+ # shutil.rmtree(entry)
# Call the users_saved hook
hooks.call("users-saved", users)