Module: check_mk
Branch: master
Commit: 00bb7f94561a2ca47fe947208babd765c58ca1a5
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=00bb7f94561a2c…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Feb 27 14:28:48 2013 +0100
resolve merge conflict
---
ChangeLog | 1 +
livestatus/src/TableStateHistory.cc | 11 ++---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6d1eedb..ea8d1d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,7 @@
* FIX: check_mk_base: fixed rounding error in get_bytes_human_readable
* FIX: check_mk: improved support of utf-8 characters in extra_service_conf
* New configuration variable contactgroup_members
+ * FIX: livestatus: table statehist now able to check AuthUser permissions
Checks & Agents:
* FIX: smart - not trying to parse unhandled lines to prevent errors
diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc
index c3c578f..8068286 100644
--- a/livestatus/src/TableStateHistory.cc
+++ b/livestatus/src/TableStateHistory.cc
@@ -615,21 +615,14 @@ void TableStateHistory::process(Query *query, HostServiceState
*hs_state)
bool TableStateHistory::isAuthorized(contact *ctc, void *data)
{
- LogEntry *entry = (LogEntry *)data;
+ HostServiceState *entry = (HostServiceState *)data;
service *svc = entry->_service;
host *hst = entry->_host;
if (hst || svc)
return is_authorized_for(ctc, hst, svc);
- // suppress entries for messages that belong to
- // hosts that do not exist anymore.
- else if (entry->_logclass == LOGCLASS_ALERT
- || entry->_logclass == LOGCLASS_NOTIFICATION
- || entry->_logclass == LOGCLASS_PASSIVECHECK
- || entry->_logclass == LOGCLASS_STATE)
- return false;
else
- return true;
+ return false;
}
Column *TableStateHistory::column(const char *colname)