From cbf425504376e21ce2816d80affcc5a5a8806bd3 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 26 Aug 2013 17:08:52 +0200 Subject: [PATCH 1/2] Revert "chmod/chown envs dir when preparing this" This reverts commit 137e683760707c690df496516432d72d8f7a81d3. In Fedora our basedir is /var/cache/icecream, it's shipped in the rpm and its owned by root:icecc. We cannot and do not want to chown/chmod it. --- daemon/environment.cpp | 7 +------ daemon/environment.h | 2 +- daemon/main.cpp | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/daemon/environment.cpp b/daemon/environment.cpp index a054419ce3..e9aacd7334 100644 --- a/daemon/environment.cpp +++ b/daemon/environment.cpp @@ -201,7 +201,7 @@ static bool cleanup_directory(const string &directory) return true; } -bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid) +bool cleanup_cache(const string &basedir) { flush_debug(); @@ -220,11 +220,6 @@ bool cleanup_cache(const string &basedir, uid_t user_uid, gid_t user_gid) return false; } - if (chown(basedir.c_str(), user_uid, user_gid) || chmod(basedir.c_str(), 0775)) { - log_perror("chown/chmod in cleanup_cache() failed"); - return false; - } - return true; } diff --git a/daemon/environment.h b/daemon/environment.h index 3d7fe318ae..87a4033224 100644 --- a/daemon/environment.h +++ b/daemon/environment.h @@ -29,7 +29,7 @@ #include class MsgChannel; -extern bool cleanup_cache(const std::string &basedir, uid_t user_uid, gid_t user_gid); +extern bool cleanup_cache(const std::string &basedir); extern int start_create_env(const std::string &basedir, uid_t user_uid, gid_t user_gid, const std::string &compiler, const std::list &extrafiles); diff --git a/daemon/main.cpp b/daemon/main.cpp index 9c2983a530..696b5ef028 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -2276,7 +2276,7 @@ int main(int argc, char **argv) pidFile << dcc_master_pid << endl; pidFile.close(); - if (!cleanup_cache(d.envbasedir, d.user_uid, d.user_gid)) { + if (!cleanup_cache(d.envbasedir)) { return 1; } -- 2.9.3