Revert "Remove "-o default_permissions" unless needed."

Caused a regression: https://github.com/vgough/encfs/issues/112 , and
removing open_readonly_workaround caused another one. So let's just
keep it as it was.

This reverts commit 82ceb88998.
This commit is contained in:
Jakob Unterwurzacher 2016-06-25 15:12:04 +02:00
parent 4a691dc0bb
commit 87ee4b7d99

View File

@ -405,17 +405,14 @@ static bool processArgs(int argc, char *argv[],
PUSHARG("-o");
PUSHARG("use_ino");
// "default_permissions" comes with a performance cost. Only enable
// it if makes sense.
for (int i = 0; i < out->fuseArgc; i++) {
if (out->fuseArgv[i] == NULL) {
continue;
} else if (strcmp(out->fuseArgv[i], "allow_other") == 0) {
// "default_permissions" comes with a performance cost, and only makes
// sense if "allow_other"" is used.
// But it works around the issues "open_readonly_workaround" causes,
// so enable it unconditionally.
// See https://github.com/vgough/encfs/issues/181 and
// https://github.com/vgough/encfs/issues/112 for more info.
PUSHARG("-o");
PUSHARG("default_permissions");
break;
}
}
#if defined(__APPLE__)
// With OSXFuse, the 'local' flag selects a local filesystem mount icon in