Add smackfsroot, smackfsdef in mount options of ecryptfs

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: If72c1205806111897a357bcd9f9fa6002d1ae6b7

diff --git a/server/engine/encryption/ecryptfs-engine.cpp b/server/engine/encryption/ecryptfs-engine.cpp
index 51fb925..5c087cf 100644 (file)
--- a/server/engine/encryption/ecryptfs-engine.cpp
+++ b/server/engine/encryption/ecryptfs-engine.cpp
@@ -303,6 +303,7 @@ void ecryptfsMount(const std::string &source, const std::string &destination, co
 
        mountOption = "ecryptfs_passthrough"
                ",ecryptfs_cipher=" CIPHER_MODE
+               ",smackfsroot=*,smackfsdef=*"
                ",ecryptfs_sig=" + std::string((char *)payload.token.password.signature) +
                ",ecryptfs_key_bytes=" + std::to_string(payload.token.password.sessionKeyEncryptionKeySize);
 

diff --git a/server/systemd/ode.service.in b/server/systemd/ode.service.in
index 2080c19..85e19c6 100644 (file)
--- a/server/systemd/ode.service.in
+++ b/server/systemd/ode.service.in
@@ -4,11 +4,10 @@ Before=deviced.service
 
 [Service]
 Type=simple
-SmackProcessLabel=System
+SmackProcessLabel=System::Privileged
 ExecStart=@BIN_DIR@/@PROJECT_NAME@d
 Restart=on-failure
 ExecReload=/bin/kill -HUP $MAINPID
-CapabilityBoundingSet=~CAP_MAC_ADMIN
 CapabilityBoundingSet=~CAP_MAC_OVERRIDE
 EnvironmentFile=/run/tizen-system-env
 EnvironmentFile=/run/xdg-root-env