[checkmk-commits] Access host authorization exclusively via MonitoringCore.

Module: check_mk Branch: master Commit: 2fbdc25f42c2deaa7bbcc3c4dea7ee46f8040e83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2fbdc25f42c2de… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jul 25 15:37:06 2017 +0200 Access host authorization exclusively via MonitoringCore. Change-Id: I3897c217fb35096400934ca64bdfb30a30e2f7ae --- livestatus/src/MonitoringCore.h | 1 + livestatus/src/ServiceListStateColumn.h | 4 ++-- livestatus/src/module.cc | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/livestatus/src/MonitoringCore.h b/livestatus/src/MonitoringCore.h index 7e3a6b8..5555b3f 100644 --- a/livestatus/src/MonitoringCore.h +++ b/livestatus/src/MonitoringCore.h @@ -93,6 +93,7 @@ public: virtual size_t maxCachedMessages() = 0; virtual bool stateHistoryFilteringEnabled() = 0; + virtual AuthorizationKind hostAuthorization() const = 0; virtual AuthorizationKind serviceAuthorization() const = 0; virtual AuthorizationKind groupAuthorization() const = 0; diff --git a/livestatus/src/ServiceListStateColumn.h b/livestatus/src/ServiceListStateColumn.h index 674bf89..3c52742 100644 --- a/livestatus/src/ServiceListStateColumn.h +++ b/livestatus/src/ServiceListStateColumn.h @@ -70,8 +70,8 @@ public: , _logictype(logictype) {} int32_t getValue(Row row, contact *auth_user) override; #ifdef CMC - static int32_t getValue(Type logictype, servicelist_t *mem, - contact *auth_user); + static int32_t getValue(MonitoringCore *mc, Type logictype, + servicelist_t *mem, contact *auth_user); #else static int32_t getValue(MonitoringCore *mc, Type logictype, servicesmember *mem, contact *auth_user); diff --git a/livestatus/src/module.cc b/livestatus/src/module.cc index 3b88f66..6d9a179 100644 --- a/livestatus/src/module.cc +++ b/livestatus/src/module.cc @@ -669,6 +669,11 @@ public: return fl_disable_statehist_filtering == 0; } + // TODO(sp) Unused in Livestatus NEB: Strange & ugly... + AuthorizationKind hostAuthorization() const override { + return AuthorizationKind::loose; + } + AuthorizationKind serviceAuthorization() const override { return fl_service_authorization; }