include default_permissions in default arguments

closes #130
This commit is contained in:
Antonio SJ Musumeci 2015-09-14 22:11:52 -04:00
parent 1782910437
commit e0cf97261c
7 changed files with 20 additions and 40 deletions

View file

@ -313,15 +313,10 @@ namespace mergerfs
const Config &config = Config::get(fc);
if(fusepath == config.controlfile)
{
if((fc->uid != ::getuid()) && (fc->gid != ::getgid()))
return -EPERM;
return _setxattr_controlfile(Config::get_writable(),
attrname,
string(attrval,attrvalsize),
flags);
}
return _setxattr_controlfile(Config::get_writable(),
attrname,
string(attrval,attrvalsize),
flags);
const ugid::Set ugid(fc->uid,fc->gid);
const rwlock::ReadGuard readlock(&config.srcmountslock);