diff options
| author | Anand Avati <avati@gluster.com> | 2011-07-01 17:19:29 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-08 02:26:22 -0700 |
| commit | 57b3b7e62487eef4c534e3fe65f954cf5d6d0ce4 (patch) | |
| tree | 4d08941898e2c79c8bddfb740a84d4db0f35becc /glusterfsd | |
| parent | 4b643cfa8847be71bb381b5a8a1a420837722e51 (diff) | |
glusterfs: add --acl command line option to load ACLs on the client side
also set the turn off filtering of ACL keys in FUSE xattr FOPs.
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 2815 (Server-enforced ACLs)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2815
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 15 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index be8c755d5de..b5d6bd61fb0 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -143,6 +143,8 @@ static struct argp_option gf_options[] = { "Add/override a translator option for a volume with specified value"}, {"read-only", ARGP_READ_ONLY_KEY, 0, 0, "Mount the filesystem in 'read-only' mode"}, + {"acl", ARGP_ACL_KEY, 0, 0, + "Mount the filesystem with POSIX ACL support"}, {"mac-compat", ARGP_MAC_COMPAT_KEY, "BOOL", OPTION_ARG_OPTIONAL, "Provide stubs for attributes needed for seamless operation on Macs " #ifdef GF_DARWIN_HOST_OS @@ -284,6 +286,15 @@ create_fuse_mount (glusterfs_ctx_t *ctx) } } + if (cmd_args->acl) { + ret = dict_set_static_ptr (master->options, "acl", "on"); + if (ret < 0) { + gf_log ("glusterfsd", GF_LOG_ERROR, + "failed to set dict value for key acl"); + goto err; + } + } + switch (cmd_args->fuse_direct_io_mode) { case GF_OPTION_DISABLE: /* disable */ ret = dict_set_static_ptr (master->options, ZR_DIRECT_IO_OPT, @@ -486,6 +497,10 @@ parse_opts (int key, char *arg, struct argp_state *state) cmd_args->read_only = 1; break; + case ARGP_ACL_KEY: + cmd_args->acl = 1; + break; + case ARGP_MAC_COMPAT_KEY: if (!arg) arg = "on"; diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index 6fb1ebbe30c..6ea8c8e95e5 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -76,6 +76,7 @@ enum argp_option_keys { ARGP_BRICK_NAME_KEY = 151, ARGP_BRICK_PORT_KEY = 152, ARGP_CLIENT_PID_KEY = 153, + ARGP_ACL_KEY = 154, }; int glusterfs_mgmt_pmap_signout (glusterfs_ctx_t *ctx); |