From 77b86bba52d76c051fcacd952d672cd6744d91f7 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 19 May 2025 15:25:21 +0200 Subject: [PATCH] Move l_MyCapabilities -> ApiCapabilities::MyCapabilities --- lib/remote/apilistener.cpp | 10 ++-------- lib/remote/apilistener.hpp | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index 4c0d006d8..1ba8ccdae 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -639,12 +639,6 @@ static const auto l_AppVersionInt (([]() -> unsigned long { + boost::lexical_cast(match[3].str()); })()); -static const auto l_MyCapabilities ( - (uint_fast64_t)ApiCapabilities::ExecuteArbitraryCommand - | (uint_fast64_t)ApiCapabilities::IfwApiCheckCommand - | (uint_fast64_t)ApiCapabilities::HostChildrenInheritObjectAuthority -); - /** * Processes a new client connection. * @@ -775,7 +769,7 @@ void ApiListener::NewClientHandlerInternal( { "method", "icinga::Hello" }, { "params", new Dictionary({ { "version", (double)l_AppVersionInt }, - { "capabilities", (double)l_MyCapabilities } + { "capabilities", (double)ApiCapabilities::MyCapabilities } }) } }), yc); @@ -814,7 +808,7 @@ void ApiListener::NewClientHandlerInternal( { "method", "icinga::Hello" }, { "params", new Dictionary({ { "version", (double)l_AppVersionInt }, - { "capabilities", (double)l_MyCapabilities } + { "capabilities", (double)ApiCapabilities::MyCapabilities } }) } }), yc); diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp index bdb0fea52..9a38a57b5 100644 --- a/lib/remote/apilistener.hpp +++ b/lib/remote/apilistener.hpp @@ -70,6 +70,8 @@ enum class ApiCapabilities : uint_fast64_t ExecuteArbitraryCommand = 1u << 0u, IfwApiCheckCommand = 1u << 1u, HostChildrenInheritObjectAuthority = 1u << 2u, + + MyCapabilities = ExecuteArbitraryCommand | IfwApiCheckCommand | HostChildrenInheritObjectAuthority }; /**