rt/mergerfs
1
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2026-10-26 19:01:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

check for system.posix_acl_default before setting umask

Browse source
This commit is contained in:
Antonio SJ Musumeci 2017-01-13 12:46:17 -05:00
parent 10a9918d20
commit d67d5dec77
6 changed files with 140 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/mknod.cpp
View file

@ -21,6 +21,7 @@
#include "config.hpp"
#include "errno.hpp"
#include "fs_acl.hpp"
#include "fs_base_mknod.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
@ -32,6 +33,20 @@ using std::string;
using std::vector;
using namespace mergerfs;
static
inline
int
_mknod_core(const string &fullpath,
mode_t mode,
const mode_t umask,
const dev_t dev)
{
if(!fs::acl::dir_has_defaults(fullpath))
mode &= ~umask;
return fs::mknod(fullpath,mode,dev);
}
static
int
_mknod_loop_core(const string &existingpath,
@ -39,6 +54,7 @@ _mknod_loop_core(const string &existingpath,
const char *fusepath,
const char *fusedirpath,
const mode_t mode,
const mode_t umask,
const dev_t dev,
const int error)
{
@ -55,7 +71,7 @@ _mknod_loop_core(const string &existingpath,
fs::path::make(&createpath,fusepath,fullpath);
rv = fs::mknod(fullpath,mode,dev);
rv = _mknod_core(fullpath,mode,umask,dev);
return calc_error(rv,error,errno);
}
@ -67,6 +83,7 @@ _mknod_loop(const string &existingpath,
const char *fusepath,
const char *fusedirpath,
const mode_t mode,
const mode_t umask,
const dev_t dev)
{
int error;
@ -76,7 +93,7 @@ _mknod_loop(const string &existingpath,
{
error = _mknod_loop_core(existingpath,*createpaths[i],
fusepath,fusedirpath,
mode,dev,error);
mode,umask,dev,error);
}
return -error;
@ -90,6 +107,7 @@ _mknod(Policy::Func::Search searchFunc,
const uint64_t minfreespace,
const char *fusepath,
const mode_t mode,
const mode_t umask,
const dev_t dev)
{
int rv;
@ -112,7 +130,7 @@ _mknod(Policy::Func::Search searchFunc,
return _mknod_loop(*existingpaths[0],createpaths,
fusepath,fusedirpathcstr,
mode,dev);
mode,umask,dev);
}
namespace mergerfs
@ -134,7 +152,8 @@ namespace mergerfs
config.srcmounts,
config.minfreespace,
fusepath,
(mode & ~fc->umask),
mode,
fc->umask,
rdev);
}
}