diff options
| author | Miklos Szeredi <miklos@szeredi.hu> | 2005-07-06 09:14:20 +0000 |
|---|---|---|
| committer | Miklos Szeredi <miklos@szeredi.hu> | 2005-07-06 09:14:20 +0000 |
| commit | 437d81187fe3aac243a4b47f4a967a195fe9f22a (patch) | |
| tree | 7aef267c8c4f79bc6e8ff42dd3337359775de4ef /kernel/inode.c | |
| parent | ac1b49d854abbbe01147d3ae652055b09e27357a (diff) | |
| download | libfuse-437d81187fe3aac243a4b47f4a967a195fe9f22a.tar.gz | |
fix
Diffstat (limited to 'kernel/inode.c')
| -rw-r--r-- | kernel/inode.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/kernel/inode.c b/kernel/inode.c index ed14602..5dacb22 100644 --- a/kernel/inode.c +++ b/kernel/inode.c @@ -44,6 +44,10 @@ struct fuse_mount_data { unsigned rootmode; unsigned user_id; unsigned group_id; + unsigned fd_present : 1; + unsigned rootmode_present : 1; + unsigned user_id_present : 1; + unsigned group_id_present : 1; unsigned flags; unsigned max_read; }; @@ -350,7 +354,6 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d) { char *p; memset(d, 0, sizeof(struct fuse_mount_data)); - d->fd = -1; d->max_read = ~0; while ((p = strsep(&opt, ",")) != NULL) { @@ -366,24 +369,28 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d) if (match_int(&args[0], &value)) return 0; d->fd = value; + d->fd_present = 1; break; case OPT_ROOTMODE: if (match_octal(&args[0], &value)) return 0; d->rootmode = value; + d->rootmode_present = 1; break; case OPT_USER_ID: if (match_int(&args[0], &value)) return 0; d->user_id = value; + d->user_id_present = 1; break; case OPT_GROUP_ID: if (match_int(&args[0], &value)) return 0; d->group_id = value; + d->group_id_present = 1; break; case OPT_DEFAULT_PERMISSIONS: @@ -417,7 +424,9 @@ static int parse_fuse_opt(char *opt, struct fuse_mount_data *d) return 0; } } - if (d->fd == -1) + + if (!d->fd_present || !d->rootmode_present || + !d->user_id_present || !d->group_id_present) return 0; return 1; |