From b371c9be04abea694ae042c73d576841cf2cb4e1 Mon Sep 17 00:00:00 2001 From: laiguizhong Date: Tue, 19 Jul 2022 11:51:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: laiguizhong --- common/appspawn_server.h | 2 +- util/src/sandbox_utils.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/appspawn_server.h b/common/appspawn_server.h index 1543d313..7169347b 100644 --- a/common/appspawn_server.h +++ b/common/appspawn_server.h @@ -39,7 +39,7 @@ extern "C" { typedef struct AppSpawnClient_ { uint32_t id; - int32_t flags; + uint32_t flags; } AppSpawnClient; #define MAX_SOCKEYT_NAME_LEN 128 diff --git a/util/src/sandbox_utils.cpp b/util/src/sandbox_utils.cpp index 2d46e097..ce74ea73 100644 --- a/util/src/sandbox_utils.cpp +++ b/util/src/sandbox_utils.cpp @@ -344,7 +344,7 @@ static int32_t HandleSpecialAppMount(const ClientSocket::AppProperty *appPropert return -1; } -static int ConvertFlagStr(const std::string &flagStr) +static uint32_t ConvertFlagStr(const std::string &flagStr) { const std::map flagsMap = {{"0", 0}, {"START_FLAGS_BACKUP", 1}, {"DLP_MANAGER", 2}}; @@ -353,7 +353,7 @@ static int ConvertFlagStr(const std::string &flagStr) return 1 << flagsMap.at(flagStr); } - return -1; + return 0; } int SandboxUtils::DoAllMntPointsMount(const ClientSocket::AppProperty *appProperty, nlohmann::json &appConfig) @@ -495,7 +495,7 @@ int32_t SandboxUtils::HandleFlagsPoint(const ClientSocket::AppProperty *appPrope if (flagPoint.find(FLAGS) != flagPoint.end()) { std::string flagsStr = flagPoint[FLAGS].get(); - int flag = ConvertFlagStr(flagsStr); + uint32_t flag = ConvertFlagStr(flagsStr); if (appProperty->flags & flag) { return DoAllMntPointsMount(appProperty, flagPoint); } -- Gitee