summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-21 02:07:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-21 02:07:26 +0000
commit7474c77cf80d1e7b718b17071f156b1c99f0f1da (patch)
tree48bcdb21b7b9cf826f785aa5652e15089c158531
parent5ef3bcc768d7387d78a4e2c89dfcc415e88c1c4d (diff)
parent07148ea2be8110e2310860c5e6a391e542a656be (diff)
downloadsystem_core-7474c77cf80d1e7b718b17071f156b1c99f0f1da.zip
system_core-7474c77cf80d1e7b718b17071f156b1c99f0f1da.tar.gz
system_core-7474c77cf80d1e7b718b17071f156b1c99f0f1da.tar.bz2
am 07148ea2: Merge "Make mkdirAndChown do what it claims to do"
* commit '07148ea2be8110e2310860c5e6a391e542a656be': Make mkdirAndChown do what it claims to do
-rw-r--r--libprocessgroup/processgroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libprocessgroup/processgroup.cpp b/libprocessgroup/processgroup.cpp
index 49f5903..71c065e 100644
--- a/libprocessgroup/processgroup.cpp
+++ b/libprocessgroup/processgroup.cpp
@@ -279,12 +279,12 @@ static int mkdirAndChown(const char *path, mode_t mode, uid_t uid, gid_t gid)
{
int ret;
- ret = mkdir(path, 0750);
+ ret = mkdir(path, mode);
if (ret < 0 && errno != EEXIST) {
return -errno;
}
- ret = chown(path, AID_SYSTEM, AID_SYSTEM);
+ ret = chown(path, uid, gid);
if (ret < 0) {
ret = -errno;
rmdir(path);