From 7b588c73ac1d422ce001d236274b04c6a1c99720 Mon Sep 17 00:00:00 2001
From: luojunlin <luojunlin5@huawei.com>
Date: Fri, 18 Oct 2024 14:41:40 +0800
Subject: [PATCH] revert userdata group

Signed-off-by: luojunlin <luojunlin5@huawei.com>
Change-Id: I7b59867d8983c68fb072057e60103d5015786e93
---
 hdc_rust/src/cffi/cmd.cpp    | 2 +-
 src/daemon/etc/hdcd.cfg      | 2 +-
 src/daemon/etc/hdcd.root.cfg | 2 +-
 src/daemon/main.cpp          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hdc_rust/src/cffi/cmd.cpp b/hdc_rust/src/cffi/cmd.cpp
index 4fcf5ee7..48c29957 100644
--- a/hdc_rust/src/cffi/cmd.cpp
+++ b/hdc_rust/src/cffi/cmd.cpp
@@ -36,7 +36,7 @@ static bool DropRootPrivileges()
 {
     int ret;
     const char *userName = "shell";
-    vector<const char *> groupsNames = { "shell", "log", "readproc", "file_manager", "user_data_rw" };
+    vector<const char *> groupsNames = { "shell", "log", "readproc", "file_manager" };
     struct passwd *user;
     gid_t *gids = nullptr;
 
diff --git a/src/daemon/etc/hdcd.cfg b/src/daemon/etc/hdcd.cfg
index ab160879..f617e310 100644
--- a/src/daemon/etc/hdcd.cfg
+++ b/src/daemon/etc/hdcd.cfg
@@ -73,7 +73,7 @@
             "name" : "hdcd",
             "path" : ["/system/bin/hdcd"],
             "uid" : "shell",
-            "gid" : [ "shell", "log", "readproc", "file_manager", "user_data_rw", "netsys_socket" ],
+            "gid" : [ "shell", "log", "readproc", "file_manager", "netsys_socket" ],
             "socket" : [{
                 "name" : "hdcd",
                 "family" : "AF_UNIX",
diff --git a/src/daemon/etc/hdcd.root.cfg b/src/daemon/etc/hdcd.root.cfg
index 4cd73aa5..af208868 100644
--- a/src/daemon/etc/hdcd.root.cfg
+++ b/src/daemon/etc/hdcd.root.cfg
@@ -87,7 +87,7 @@
             "name" : "hdcd",
             "path" : ["/system/bin/hdcd"],
             "uid" : "root",
-            "gid" : [ "root", "shell", "log", "readproc", "file_manager", "user_data_rw" ],
+            "gid" : [ "root", "shell", "log", "readproc", "file_manager" ],
             "socket" : [{
                 "name" : "hdcd",
                 "family" : "AF_UNIX",
diff --git a/src/daemon/main.cpp b/src/daemon/main.cpp
index e2503904..82e3e17c 100644
--- a/src/daemon/main.cpp
+++ b/src/daemon/main.cpp
@@ -193,7 +193,7 @@ bool DropRootPrivileges()
 {
     int ret;
     const char *userName = "shell";
-    vector<const char *> groupsNames = { "shell", "log", "readproc", "file_manager", "user_data_rw" };
+    vector<const char *> groupsNames = { "shell", "log", "readproc", "file_manager" };
     struct passwd *user;
     gid_t *gids = nullptr;