projects
/
platform
/
core
/
test
/
security-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add rule file path getters to PolicyConfiguration
[platform/core/test/security-tests.git]
/
src
/
security-manager-tests
/
common
/
sm_commons.cpp
diff --git
a/src/security-manager-tests/common/sm_commons.cpp
b/src/security-manager-tests/common/sm_commons.cpp
index
7e5f52a
..
e14f142
100644
(file)
--- a/
src/security-manager-tests/common/sm_commons.cpp
+++ b/
src/security-manager-tests/common/sm_commons.cpp
@@
-55,7
+55,6
@@
using namespace SecurityManagerTest;
using namespace SecurityManagerTest;
-#define CONF_DIR "/usr/share/security-manager/policy/"
#define SMACK_RULES_PATH "/sys/fs/smackfs/load2"
#define ALLOW 0
#define SMACK_RULES_PATH "/sys/fs/smackfs/load2"
#define ALLOW 0
@@
-196,8
+195,8
@@
static void check_app_smack_accesses(const std::string &appId, const std::string
bool isHybrid = false)
{
static const std::vector<AccessRequest> rules[] =
bool isHybrid = false)
{
static const std::vector<AccessRequest> rules[] =
- {parseSmackRulesFile(
CONF_DIR "pkg-rules-template.smack"
),
- parseSmackRulesFile(
CONF_DIR "app-rules-template.smack"
)};
+ {parseSmackRulesFile(
PolicyConfiguration::getPkgRulesFilePath()
),
+ parseSmackRulesFile(
PolicyConfiguration::getAppRulesFilePath()
)};
const std::pair<std::string, std::string> switchAliases[] =
{std::make_pair("~PATH_RW~", generatePathRWLabel(pkgId)),
const std::pair<std::string, std::string> switchAliases[] =
{std::make_pair("~PATH_RW~", generatePathRWLabel(pkgId)),