Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow default_permissions and allow_other to be disabled. #139

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −4
Open

Allow default_permissions and allow_other to be disabled. #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions fuse-ext2/fuse-ext2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/

#include <stdbool.h>
#include "fuse-ext2.h"

static const char *HOME = "http://github.com/alperakcan/fuse-ext2/";

#if __FreeBSD__ == 10
static char def_opts[] = "allow_other,default_permissions,local,";
static char def_opts_rd[] = "noappledouble,";
#else
static char def_opts[] = "allow_other,default_permissions,";
static char def_opts_rd[] = "";
#endif

Expand Down Expand Up @@ -171,8 +170,10 @@ static int parse_options (int argc, char *argv[], struct extfs_data *opts)
static char * parse_mount_options (const char *orig_opts, struct extfs_data *opts)
{
char *options, *s, *opt, *val, *ret;
bool allow_other = true;
bool default_permissions = true;

ret = malloc(strlen(def_opts) + strlen(def_opts_rd) + strlen(orig_opts) + 256 + PATH_MAX);
ret = malloc(strlen(def_opts_rd) + strlen(orig_opts) + 256 + PATH_MAX);
if (!ret) {
return NULL;
}
Expand Down Expand Up @@ -231,6 +232,14 @@ static char * parse_mount_options (const char *orig_opts, struct extfs_data *opt
#if __FreeBSD__ == 10
strcat(ret, "force,");
#endif
} else if (!strcmp(opt, "noallow_other")) {
allow_other = false;
strcat(ret, opt);
strcat(ret, ",");
} else if (!strcmp(opt, "nodefault_permissions")) {
default_permissions = false;
strcat(ret, opt);
strcat(ret, ",");
} else { /* Probably FUSE option. */
strcat(ret, opt);
if (val) {
Expand All @@ -246,7 +255,13 @@ static char * parse_mount_options (const char *orig_opts, struct extfs_data *opt
opts->readonly = 1;
}

strcat(ret, def_opts);
if (allow_other)
strcat(ret, "allow_other,");
if (default_permissions)
strcat(ret, "default_permissions,");
#if __FreeBSD__ == 10
strcat(ret, "local,");
#endif
if (opts->readonly == 1) {
strcat(ret, def_opts_rd);
strcat(ret, "ro,");
Expand Down