Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 08:53:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: fuse: remove PersistentAcls options; it is always enabled

Browse Source
This commit is contained in:
Bill Zissimopoulos 2016-06-13 00:52:48 -07:00
parent 9b56b3a420
commit 00976b92b8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dll/fuse/fuse.c
View File

@ -39,9 +39,8 @@ struct fsp_fuse_core_opt_data
set_gid, gid, set_gid, gid,
set_attr_timeout, attr_timeout; set_attr_timeout, attr_timeout;
int set_FileInfoTimeout; int set_FileInfoTimeout;
int CaseInsensitiveSearch, PersistentAcls, int CaseInsensitiveSearch, ReparsePoints,
ReparsePoints, NamedStreams, NamedStreams, ReadOnlyVolume;
ReadOnlyVolume;
FSP_FSCTL_VOLUME_PARAMS VolumeParams; FSP_FSCTL_VOLUME_PARAMS VolumeParams;
}; };
@ -90,7 +89,6 @@ static struct fuse_opt fsp_fuse_core_opts[] =
FSP_FUSE_CORE_OPT("FileInfoTimeout=", set_FileInfoTimeout, 1), FSP_FUSE_CORE_OPT("FileInfoTimeout=", set_FileInfoTimeout, 1),
FSP_FUSE_CORE_OPT("FileInfoTimeout=%d", VolumeParams.FileInfoTimeout, 0), FSP_FUSE_CORE_OPT("FileInfoTimeout=%d", VolumeParams.FileInfoTimeout, 0),
FSP_FUSE_CORE_OPT("CaseInsensitiveSearch", CaseInsensitiveSearch, 1), FSP_FUSE_CORE_OPT("CaseInsensitiveSearch", CaseInsensitiveSearch, 1),
FSP_FUSE_CORE_OPT("PersistentAcls", PersistentAcls, 1),
FSP_FUSE_CORE_OPT("ReparsePoints", ReparsePoints, 1), FSP_FUSE_CORE_OPT("ReparsePoints", ReparsePoints, 1),
FSP_FUSE_CORE_OPT("NamedStreams", NamedStreams, 1), FSP_FUSE_CORE_OPT("NamedStreams", NamedStreams, 1),
FUSE_OPT_KEY("HardLinks", FUSE_OPT_KEY_DISCARD), FUSE_OPT_KEY("HardLinks", FUSE_OPT_KEY_DISCARD),
@ -433,7 +431,6 @@ static int fsp_fuse_core_opt_proc(void *opt_data0, const char *arg, int key,
" -o VolumeSerialNumber=N 32-bit wide\n" " -o VolumeSerialNumber=N 32-bit wide\n"
" -o FileInfoTimeout=N FileInfo/Security/VolumeInfo timeout (millisec)\n" " -o FileInfoTimeout=N FileInfo/Security/VolumeInfo timeout (millisec)\n"
" -o CaseInsensitiveSearch file system supports case-insensitive file names\n" " -o CaseInsensitiveSearch file system supports case-insensitive file names\n"
" -o PersistentAcls file system preserves and enforces ACL's\n"
//" -o ReparsePoints file system supports reparse points\n" //" -o ReparsePoints file system supports reparse points\n"
//" -o NamedStreams file system supports named streams\n" //" -o NamedStreams file system supports named streams\n"
//" -o ReadOnlyVolume file system is read only\n" //" -o ReadOnlyVolume file system is read only\n"
@ -482,7 +479,7 @@ FSP_FUSE_API struct fuse *fsp_fuse_new(struct fsp_fuse_env *env,
if (!opt_data.set_FileInfoTimeout && opt_data.set_attr_timeout) if (!opt_data.set_FileInfoTimeout && opt_data.set_attr_timeout)
opt_data.VolumeParams.FileInfoTimeout = opt_data.set_attr_timeout * 1000; opt_data.VolumeParams.FileInfoTimeout = opt_data.set_attr_timeout * 1000;
opt_data.VolumeParams.CaseSensitiveSearch = !opt_data.CaseInsensitiveSearch; opt_data.VolumeParams.CaseSensitiveSearch = !opt_data.CaseInsensitiveSearch;
opt_data.VolumeParams.PersistentAcls = !!opt_data.PersistentAcls; opt_data.VolumeParams.PersistentAcls = TRUE;
opt_data.VolumeParams.ReparsePoints = !!opt_data.ReparsePoints; opt_data.VolumeParams.ReparsePoints = !!opt_data.ReparsePoints;
opt_data.VolumeParams.NamedStreams = !!opt_data.NamedStreams; opt_data.VolumeParams.NamedStreams = !!opt_data.NamedStreams;
opt_data.VolumeParams.ReadOnlyVolume = !!opt_data.ReadOnlyVolume; opt_data.VolumeParams.ReadOnlyVolume = !!opt_data.ReadOnlyVolume;