From 79b72aab9abb2ed15eafbacda5028f58a5740de5 Mon Sep 17 00:00:00 2001 From: Lukasz Wojciechowski Date: Fri, 16 Jan 2015 13:21:46 +0100 Subject: [PATCH] Fix missing predefined policies description in offline Predefined policies description were returned only in online admin mode. Offline admin mode returned just policy types provided by plugins. Now both offline and online mode return predefined and plugin provided policy types. Change-Id: I890062638a8d2d54dc67edd4a883cfccea5f3905 --- src/admin/logic/OfflineLogic.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/admin/logic/OfflineLogic.cpp b/src/admin/logic/OfflineLogic.cpp index f421f2a..2a7bc89 100644 --- a/src/admin/logic/OfflineLogic.cpp +++ b/src/admin/logic/OfflineLogic.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -148,6 +149,8 @@ int OfflineLogic::adminCheck(const PolicyBucketId &startBucket, bool recursive, int OfflineLogic::listDescriptions(std::vector &descriptions) { acquirePlugins(); descriptions = m_pluginManager->getPolicyDescriptions(); + descriptions.insert(descriptions.begin(), predefinedPolicyDescr.begin(), + predefinedPolicyDescr.end()); return CYNARA_API_SUCCESS; } -- 2.7.4