From decc3c121bdb2a1c0f9ae18939ac948c46303b95 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Thu, 17 Feb 2022 13:47:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=88=86=E7=BA=A7=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E7=BC=96=E8=AF=91=E4=BE=9D=E8=B5=96=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=20Signed-off-by:=20zuojiangjiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/distributeddataservice/app/BUILD.gn | 2 +- services/distributeddataservice/app/src/security/security.cpp | 4 ++-- services/distributeddataservice/app/test/BUILD.gn | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/distributeddataservice/app/BUILD.gn b/services/distributeddataservice/app/BUILD.gn index 659ea25f2..e50a48305 100755 --- a/services/distributeddataservice/app/BUILD.gn +++ b/services/distributeddataservice/app/BUILD.gn @@ -47,7 +47,7 @@ config("module_private_config") { "//foundation/distributeddatamgr/distributeddatamgr/frameworks/innerkitsimpl/rdb/src", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/service/rdb", "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include", - "//foundation/filemanagement/file_api/interfaces/innerkits/include", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/mod_securitylabel", "//utils/system/safwk/native/include", "../adapter/include/account", "../adapter/include/permission", diff --git a/services/distributeddataservice/app/src/security/security.cpp b/services/distributeddataservice/app/src/security/security.cpp index e22d4703f..398b4c141 100644 --- a/services/distributeddataservice/app/src/security/security.cpp +++ b/services/distributeddataservice/app/src/security/security.cpp @@ -217,7 +217,7 @@ DBStatus Security::SetFileSecurityOption(const std::string &filePath, const Secu return INVALID_ARGS; } - bool result = FileIO::SecurityLabel::SetSecurityLabel(filePath, dataLevel); + bool result = OHOS::DistributedFS::ModuleSecurityLabel::SecurityLabel::SetSecurityLabel(filePath, dataLevel); if (!result) { ZLOGE("set security label failed!, result:%d, datalevel:%s", result, dataLevel.c_str()); return DB_ERROR; @@ -239,7 +239,7 @@ DBStatus Security::GetFileSecurityOption(const std::string &filePath, SecurityOp return OK; } - std::string value = FileIO::SecurityLabel::GetSecurityLabel(filePath); + std::string value = OHOS::DistributedFS::ModuleSecurityLabel::SecurityLabel::GetSecurityLabel(filePath); if (!IsXattrValueValid(value)) { option = {NOT_SET, ECE}; return OK; diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn index 70982a4ea..95b783da7 100755 --- a/services/distributeddataservice/app/test/BUILD.gn +++ b/services/distributeddataservice/app/test/BUILD.gn @@ -31,7 +31,7 @@ config("module_private_config") { "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/service/bootstrap/include", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/service/config/include", "//foundation/distributeddatamgr/distributeddatamgr/services/distributeddataservice/service/directory/include", - "//foundation/filemanagement/file_api/interfaces/innerkits/include", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/mod_securitylabel", "//utils/native/base/include", "//utils/system/safwk/native/include", "../include", -- Gitee