From 1ee3cc8fe28542a6c0cf5a78dd65f47a815c4d80 Mon Sep 17 00:00:00 2001
From: BanYG <matengfei19@huawei.com>
Date: Sun, 28 May 2023 09:41:22 +0000
Subject: [PATCH] Change the uid/gid of the southbound process from useriam to
 their respective definitions

Signed-off-by: BanYG <matengfei19@huawei.com>
---
 sa_profile/BUILD.gn           |  6 +-----
 sa_profile/useriam.cfg        |  7 -------
 sa_profile/useriam_bionic.cfg | 29 -----------------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 sa_profile/useriam_bionic.cfg

diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn
index 83fd3c162..d0e5c4d91 100644
--- a/sa_profile/BUILD.gn
+++ b/sa_profile/BUILD.gn
@@ -25,11 +25,7 @@ ohos_sa_profile("userauth_sa_profile") {
 }
 
 ohos_prebuilt_etc("useriam.init") {
-  if (use_musl) {
-    source = "useriam.cfg"
-  } else {
-    source = "useriam_bionic.cfg"
-  }
+  source = "useriam.cfg"
   relative_install_dir = "init"
 
   subsystem_name = "useriam"
diff --git a/sa_profile/useriam.cfg b/sa_profile/useriam.cfg
index 89984c94f..170a7339d 100644
--- a/sa_profile/useriam.cfg
+++ b/sa_profile/useriam.cfg
@@ -1,11 +1,4 @@
 {
-    "jobs" : [{
-            "name" : "service:useriam",
-            "cmds" : [
-                "mkdir /data/service/el1/public/userauth/ 0700 useriam useriam"
-            ]
-        }
-    ],
     "services" : [{
             "name" : "useriam",
             "path" : ["/system/bin/sa_main", "/system/profile/useriam.json"],
diff --git a/sa_profile/useriam_bionic.cfg b/sa_profile/useriam_bionic.cfg
deleted file mode 100644
index 95a986f29..000000000
--- a/sa_profile/useriam_bionic.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "jobs" : [{
-            "name" : "service:useriam",
-            "cmds" : [
-                "mkdir /data/service/el1/public/userauth/ 0700 ohos_useriam ohos_useriam"
-            ]
-        }
-    ],
-    "services" : [{
-            "name" : "useriam",
-            "path" : ["/system/bin/sa_main", "/system/profile/useriam.json"],
-            "uid" : "ohos_useriam",
-            "gid" : ["ohos_useriam", "shell"],
-            "apl" : "system_basic",
-            "permission" : [
-                "ohos.permission.ACCESS_AUTH_RESPOOL",
-                "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION"
-            ],
-            "permission_acls" : [
-                "ohos.permission.ACCESS_AUTH_RESPOOL",
-                "ohos.permission.INTERACT_ACROSS_LOCAL_ACCOUNTS_EXTENSION"
-            ],
-            "secon" : "u:r:useriam:s0",
-            "jobs" : {
-                "on-start" : "service:useriam"
-            }
-        }
-    ]
-}