From a424ab0444540579d462856a9d7fb918ebd33603 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 Jun 2016 18:17:30 +0200 Subject: createTempDir(): Don't do a chown on Linux It's not needed and can cause problems in a user namespace. --- src/libutil/util.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libutil/util.cc') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 67558cc0b33c..788d01f59a18 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -384,6 +384,7 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix, checkInterrupt(); Path tmpDir = tempName(tmpRoot, prefix, includePid, counter); if (mkdir(tmpDir.c_str(), mode) == 0) { +#if __FreeBSD__ /* Explicitly set the group of the directory. This is to work around around problems caused by BSD's group ownership semantics (directories inherit the group of @@ -394,6 +395,7 @@ Path createTempDir(const Path & tmpRoot, const Path & prefix, have the setgid bit set on directories. */ if (chown(tmpDir.c_str(), (uid_t) -1, getegid()) != 0) throw SysError(format("setting group of directory ‘%1%’") % tmpDir); +#endif return tmpDir; } if (errno != EEXIST) -- cgit 1.4.1