From ed4bc5a48c33142891e2ebe5a0bfdc676a1ba8d2 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Mon, 26 Aug 2013 17:08:52 +0200 Subject: [PATCH 1/3] Revert "chmod/chown envs dir when preparing this" This reverts commit 137e683760707c690df496516432d72d8f7a81d3. --- 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 a134b8e..3dbf27a 100644 --- a/daemon/environment.cpp +++ b/daemon/environment.cpp @@ -200,7 +200,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(); @@ -219,11 +219,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 c50a339..3e30f10 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 8f7be1c..4db17f2 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -2268,7 +2268,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.1.0