From e872065fea5914995bf39185551443687476faa1 Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Thu, 5 Mar 2015 12:36:02 +0100 Subject: [PATCH] Move template for application Smack rules to security-manager-policy Change-Id: If323c8d8e8a930291d2db348e5a375711345707a Signed-off-by: Rafal Krypa --- packaging/security-manager.spec | 3 --- policy/CMakeLists.txt | 1 + app-rules-template.smack => policy/app-rules-template.smack | 0 src/common/smack-rules.cpp | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename app-rules-template.smack => policy/app-rules-template.smack (100%) diff --git a/packaging/security-manager.spec b/packaging/security-manager.spec index 3daa3be..1783fc4 100644 --- a/packaging/security-manager.spec +++ b/packaging/security-manager.spec @@ -81,8 +81,6 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_datadir}/license cp LICENSE %{buildroot}%{_datadir}/license/%{name} cp LICENSE %{buildroot}%{_datadir}/license/libsecurity-manager-client -mkdir -p %{buildroot}/%{TZ_SYS_SMACK} -cp app-rules-template.smack %{buildroot}/%{TZ_SYS_SMACK} %make_install mkdir -p %{buildroot}/%{_unitdir}/sockets.target.wants @@ -137,7 +135,6 @@ fi %{_libdir}/libsecurity-manager-commons.so.* %attr(-,root,root) %{_unitdir}/security-manager.* %attr(-,root,root) %{_unitdir}/sockets.target.wants/security-manager.* -%attr(-,root,root) %{TZ_SYS_SMACK}/app-rules-template.smack %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db %config(noreplace) %attr(0600,root,root) %{TZ_SYS_DB}/.security-manager.db-journal %{_datadir}/license/%{name} diff --git a/policy/CMakeLists.txt b/policy/CMakeLists.txt index 1d35a3f..32d6ee6 100644 --- a/policy/CMakeLists.txt +++ b/policy/CMakeLists.txt @@ -1,3 +1,4 @@ FILE(GLOB USERTYPE_POLICY_FILES usertype-*.profile) INSTALL(FILES ${USERTYPE_POLICY_FILES} DESTINATION ${SHARE_INSTALL_PREFIX}/security-manager/policy) +INSTALL(FILES "app-rules-template.smack" DESTINATION ${SHARE_INSTALL_PREFIX}/security-manager/policy) INSTALL(PROGRAMS security-manager-policy-reload DESTINATION ${BIN_INSTALL_DIR}) diff --git a/app-rules-template.smack b/policy/app-rules-template.smack similarity index 100% rename from app-rules-template.smack rename to policy/app-rules-template.smack diff --git a/src/common/smack-rules.cpp b/src/common/smack-rules.cpp index ace23ba..221cf4d 100644 --- a/src/common/smack-rules.cpp +++ b/src/common/smack-rules.cpp @@ -44,7 +44,7 @@ namespace SecurityManager { const char *const SMACK_APP_LABEL_TEMPLATE = "~APP~"; const char *const SMACK_PKG_LABEL_TEMPLATE = "~PKG~"; -const char *const APP_RULES_TEMPLATE_FILE_PATH = tzplatform_mkpath(TZ_SYS_SMACK, "app-rules-template.smack"); +const char *const APP_RULES_TEMPLATE_FILE_PATH = tzplatform_mkpath4(TZ_SYS_SHARE, "security-manager", "policy", "app-rules-template.smack"); const char *const SMACK_APP_IN_PACKAGE_PERMS = "rwxat"; SmackRules::SmackRules() -- 2.7.4