philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Fix 64-bit compiler warnings.

Browse source
This commit is contained in:
Eelco Dolstra 2007-02-06 20:03:53 +00:00
parent 52d03276dd
commit 46605fb4f5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/local-store.cc
View file

@ -205,10 +205,10 @@ static void _canonicalisePathMetaData(const Path & path)
users group); we check for this case below. */ users group); we check for this case below. */
if (st.st_uid != geteuid()) { if (st.st_uid != geteuid()) {
#if HAVE_LCHOWN #if HAVE_LCHOWN
if (lchown(path.c_str(), geteuid(), -1) == -1) if (lchown(path.c_str(), geteuid(), (gid_t) -1) == -1)
#else #else
if (!S_ISLNK(st.st_mode) && if (!S_ISLNK(st.st_mode) &&
chown(path.c_str(), geteuid(), -1) == -1) chown(path.c_str(), geteuid(), (gid_t) -1) == -1)
#endif #endif
throw SysError(format("changing owner of `%1%' to %2%") throw SysError(format("changing owner of `%1%' to %2%")
% path % geteuid()); % path % geteuid());

4
src/nix-setuid-helper/nix-setuid-helper.cc
View file

@ -105,7 +105,7 @@ static void runBuilder(uid_t uidNix, gid_t gidBuildUsers,
account. The idea is that the current directory is the account. The idea is that the current directory is the
temporary build directory in /tmp or somewhere else, and we temporary build directory in /tmp or somewhere else, and we
don't want to create that directory here. */ don't want to create that directory here. */
secureChown(uidNix, -1, uidTargetUser, gidBuildUsers, "."); secureChown(uidNix, (gid_t) -1, uidTargetUser, gidBuildUsers, ".");
/* Set the real, effective and saved gid. Must be done before /* Set the real, effective and saved gid. Must be done before
setuid(), otherwise it won't set the real and saved gids. */ setuid(), otherwise it won't set the real and saved gids. */
@ -239,7 +239,7 @@ static void run(int argc, char * * argv)
else if (command == "get-ownership") { else if (command == "get-ownership") {
/* Syntax: nix-setuid-helper get-ownership <path> */ /* Syntax: nix-setuid-helper get-ownership <path> */
if (argc != 3) throw Error("missing path"); if (argc != 3) throw Error("missing path");
secureChown(-1, gidBuildUsers, uidNix, gidBuildUsers, argv[2]); secureChown((uid_t) -1, gidBuildUsers, uidNix, gidBuildUsers, argv[2]);
} }
else if (command == "kill") { else if (command == "kill") {