From 202fdade5d77f9b98019588569946fd8b3226a71 Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Tue, 20 Jan 2015 19:46:33 +0100 Subject: [PATCH] Convert static method CynaraAdmin::SetPolicies back to normal Now that CynaraAdmin is a singleton class, it's methods should be called from the singleton instance. Change-Id: I9db11c516d2c92cb5994ebb9605d0d5f1789cead Signed-off-by: Rafal Krypa --- src/common/cynara.cpp | 3 +-- src/common/include/cynara.h | 2 +- src/common/service_impl.cpp | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/common/cynara.cpp b/src/common/cynara.cpp index 2073da3..293826b 100644 --- a/src/common/cynara.cpp +++ b/src/common/cynara.cpp @@ -167,7 +167,6 @@ void CynaraAdmin::UpdateAppPolicy( const std::vector &oldPrivileges, const std::vector &newPrivileges) { - CynaraAdmin cynaraAdmin; std::vector policies; // Perform sort-merge join on oldPrivileges and newPrivileges. @@ -212,7 +211,7 @@ void CynaraAdmin::UpdateAppPolicy( CynaraAdminPolicy::Operation::Allow)); } - cynaraAdmin.SetPolicies(policies); + SetPolicies(policies); } Cynara::Cynara() diff --git a/src/common/include/cynara.h b/src/common/include/cynara.h index 646deff..802cbb1 100644 --- a/src/common/include/cynara.h +++ b/src/common/include/cynara.h @@ -101,7 +101,7 @@ public: * TODO: drop oldPrivileges argument and get them directly from Cynara. * Appropriate Cynara interface is needed first. */ - static void UpdateAppPolicy(const std::string &label, const std::string &user, + void UpdateAppPolicy(const std::string &label, const std::string &user, const std::vector &oldPrivileges, const std::vector &newPrivileges); diff --git a/src/common/service_impl.cpp b/src/common/service_impl.cpp index f4ec16f..5c34017 100644 --- a/src/common/service_impl.cpp +++ b/src/common/service_impl.cpp @@ -177,7 +177,7 @@ int appInstall(const app_inst_req &req, uid_t uid) PrivilegeDb::getInstance().UpdateAppPrivileges(req.appId, uid, req.privileges); /* Get all application ids in the package to generate rules withing the package */ PrivilegeDb::getInstance().GetAppIdsForPkgId(req.pkgId, pkgContents); - CynaraAdmin::UpdateAppPolicy(smackLabel, uidstr, oldAppPrivileges, + CynaraAdmin::getInstance().UpdateAppPolicy(smackLabel, uidstr, oldAppPrivileges, req.privileges); PrivilegeDb::getInstance().CommitTransaction(); LogDebug("Application installation commited to database"); @@ -256,7 +256,7 @@ int appUninstall(const std::string &appId, uid_t uid) PrivilegeDb::getInstance().GetAppPrivileges(appId, uid, oldAppPrivileges); PrivilegeDb::getInstance().UpdateAppPrivileges(appId, uid, std::vector()); PrivilegeDb::getInstance().RemoveApplication(appId, uid, removePkg); - CynaraAdmin::UpdateAppPolicy(smackLabel, uidstr, oldAppPrivileges, + CynaraAdmin::getInstance().UpdateAppPolicy(smackLabel, uidstr, oldAppPrivileges, std::vector()); PrivilegeDb::getInstance().CommitTransaction(); LogDebug("Application uninstallation commited to database"); -- 2.7.4