From 903a155d4bb4946726aff94103c204e2f72aee2d Mon Sep 17 00:00:00 2001 From: Marcin Lis Date: Fri, 19 Dec 2014 22:51:44 +0100 Subject: [PATCH] Change "operation" argument type in CynaraAdminPolicy constructor This change is needed in for policy updates. We need to support wide spectrum of results, starting from DENY (0) to ALLOW (0xFFFF). SM should not be limited to few enum class literals. Change-Id: I1e8d26893120309f6d6276da4bb5e146936a7e59 Signed-off-by: Marcin Lis --- src/common/cynara.cpp | 12 ++++++------ src/common/include/cynara.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/cynara.cpp b/src/common/cynara.cpp index 030041f..39b7e05 100644 --- a/src/common/cynara.cpp +++ b/src/common/cynara.cpp @@ -113,7 +113,7 @@ CynaraAdmin::BucketsMap CynaraAdmin::Buckets = CynaraAdminPolicy::CynaraAdminPolicy(const std::string &client, const std::string &user, - const std::string &privilege, Operation operation, + const std::string &privilege, int operation, const std::string &bucket) { this->client = strdup(client.c_str()); @@ -131,7 +131,7 @@ CynaraAdminPolicy::CynaraAdminPolicy(const std::string &client, const std::strin std::string("Error in CynaraAdminPolicy allocation.")); } - this->result = static_cast(operation); + this->result = operation; this->result_extra = nullptr; } @@ -271,14 +271,14 @@ void CynaraAdmin::UpdateAppPolicy( LogDebug("(user = " << user << " label = " << label << ") " << "removing privilege " << *oldIter); policies.push_back(CynaraAdminPolicy(label, user, *oldIter, - CynaraAdminPolicy::Operation::Delete, + static_cast(CynaraAdminPolicy::Operation::Delete), Buckets.at(Bucket::MANIFESTS))); ++oldIter; } else { LogDebug("(user = " << user << " label = " << label << ") " << "adding privilege " << *newIter); policies.push_back(CynaraAdminPolicy(label, user, *newIter, - CynaraAdminPolicy::Operation::Allow, + static_cast(CynaraAdminPolicy::Operation::Allow), Buckets.at(Bucket::MANIFESTS))); ++newIter; } @@ -288,7 +288,7 @@ void CynaraAdmin::UpdateAppPolicy( LogDebug("(user = " << user << " label = " << label << ") " << "removing privilege " << *oldIter); policies.push_back(CynaraAdminPolicy(label, user, *oldIter, - CynaraAdminPolicy::Operation::Delete, + static_cast(CynaraAdminPolicy::Operation::Delete), Buckets.at(Bucket::MANIFESTS))); } @@ -296,7 +296,7 @@ void CynaraAdmin::UpdateAppPolicy( LogDebug("(user = " << user << " label = " << label << ") " << "adding privilege " << *newIter); policies.push_back(CynaraAdminPolicy(label, user, *newIter, - CynaraAdminPolicy::Operation::Allow, + static_cast(CynaraAdminPolicy::Operation::Allow), Buckets.at(Bucket::MANIFESTS))); } diff --git a/src/common/include/cynara.h b/src/common/include/cynara.h index 97a6375..ce103f0 100644 --- a/src/common/include/cynara.h +++ b/src/common/include/cynara.h @@ -68,7 +68,7 @@ struct CynaraAdminPolicy : cynara_admin_policy }; CynaraAdminPolicy(const std::string &client, const std::string &user, - const std::string &privilege, Operation operation, + const std::string &privilege, int operation, const std::string &bucket = std::string(CYNARA_ADMIN_DEFAULT_BUCKET)); CynaraAdminPolicy(const std::string &client, const std::string &user, -- 2.7.4