[checkmk-commits] Check_MK Git: check_mk: FIX Fixed logwatch permission check when using liveproxy

Module: check_mk Branch: master Commit: 4f2f88b61df403fc288def028b73f10eff81a88d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f2f88b61df403… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 11 16:15:27 2013 +0100 FIX Fixed logwatch permission check when using liveproxy When using the liveproxy daemon and logwatch together, the permission check for non administrative users always failed. As a result normal users could not access logfiles, which they should be allowed to see. --- .werks/206 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/livestatus.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/206 b/.werks/206 new file mode 100644 index 0000000..337f305 --- /dev/null +++ b/.werks/206 @@ -0,0 +1,11 @@ +Title: Fixed logwatch permission check when using liveproxy +Level: 1 +Component: multisite +Version: 1.2.3i7 +Date: 1384182853 +Class: fix + +When using the liveproxy daemon and logwatch together, the +permission check for non administrative users always failed. +As a result normal users could not access logfiles, which +they should be allowed to see. diff --git a/ChangeLog b/ChangeLog index b7cdd8e..734c5d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * 0049 FIX: Fixed check-mk-automation call on each new created apache thread... * 0203 FIX: Changed sidebar reload interval to be more random... * 0204 FIX: Reduced I/O on logins with access time recording or failed login counts... + * 0206 FIX: Fixed logwatch permission check when using liveproxy... WATO: * 0053 New rule for configuring the display_name of a service... diff --git a/web/htdocs/livestatus.py b/web/htdocs/livestatus.py index 8c5ba3b..f0de1c4 100644 --- a/web/htdocs/livestatus.py +++ b/web/htdocs/livestatus.py @@ -672,7 +672,7 @@ class MultiSiteConnection(Helpers): # Return connection to localhost (UNIX), if available def local_connection(self): for sitename, site, connection in self.connections: - if site["socket"].startswith("unix:"): + if site["socket"].startswith("unix:") and "liveproxy" not in site["socket"]: return connection raise MKLivestatusConfigError("No livestatus connection to local host")