From ec23ecc64d40b7f65585c23592db123127967221 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 Dec 2006 15:54:52 +0000 Subject: * In the garbage collector, if deleting a path fails, try to fix its ownership, then try again. --- src/libstore/build.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/libstore/build.cc') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index c4ff62891404..7ae0dd4ec459 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -452,12 +452,18 @@ void UserLock::release() } -static bool amPrivileged() +bool amPrivileged() { return geteuid() == 0; } +bool haveBuildUsers() +{ + return querySetting("build-users-group", "") != ""; +} + + static void killUserWrapped(uid_t uid) { if (amPrivileged()) @@ -468,7 +474,7 @@ static void killUserWrapped(uid_t uid) } -static void getOwnership(const Path & path) +void getOwnership(const Path & path) { string program = nixLibexecDir + "/nix-setuid-helper"; @@ -513,8 +519,7 @@ static void deletePathWrapped(const Path & path) /* When using build users and we're not root, we may not have sufficient permission to delete the path. So use the setuid helper to change ownership to us. */ - if (querySetting("build-users-group", "") != "" - || !amPrivileged()) + if (haveBuildUsers() && !amPrivileged()) getOwnership(path); deletePath(path); } @@ -1320,7 +1325,7 @@ void DerivationGoal::startBuilder() /* If `build-users-group' is not empty, then we have to build as one of the members of that group. */ - if (querySetting("build-users-group", "") != "") { + if (haveBuildUsers()) { buildUser.acquire(); assert(buildUser.getUID() != 0); assert(buildUser.getGID() != 0); -- cgit 1.4.1