Create per user directories only for users in 'users' group

Change-Id: I2fa649ffc31979794f3a7d130be9a212dfdf3609

diff --git a/src/pkgdir_tool/pkgdir_tool.cc b/src/pkgdir_tool/pkgdir_tool.cc
index 7816bde..bef90e8 100644 (file)
--- a/src/pkgdir_tool/pkgdir_tool.cc
+++ b/src/pkgdir_tool/pkgdir_tool.cc
@@ -11,6 +11,7 @@
 #include <vcore/Certificate.h>
 #include <pkgmgr-info.h>
 #include <pwd.h>
+#include <grp.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <tzplatform_config.h>
@@ -228,6 +229,11 @@ bool CreatePerUserDirectories(const std::string& pkgid,
       LOG(WARNING) << "Failed to get user for home directory: " << user;
       continue;
     }
+
+    struct group* gr = getgrgid(pwd->pw_gid);  // NOLINT
+    if (strcmp(gr->gr_name, tzplatform_getenv(TZ_SYS_USER_GROUP)) != 0)
+      continue;
+
     LOG(DEBUG) << "Creating directories for uid: " << pwd->pw_uid << ", gid: "
                << pwd->pw_gid << ", home: " << home_path;
     tzplatform_set_user(pwd->pw_uid);
@@ -304,6 +310,10 @@ bool DeletePerUserDirectories(const std::string& pkgid) {
       continue;
     }
 
+    struct group* gr = getgrgid(pwd->pw_gid);  // NOLINT
+    if (strcmp(gr->gr_name, tzplatform_getenv(TZ_SYS_USER_GROUP)) != 0)
+      continue;
+
     if (ci::IsPackageInstalled(pkgid, pwd->pw_uid)) continue;
 
     LOG(DEBUG) << "Deleting directories for uid: " << pwd->pw_uid << ", gid: "