diff options
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 33 | ||||
| -rw-r--r-- | glusterfsd/src/glusterfsd.h | 1 | 
2 files changed, 34 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 098a9169aa4..c47d2ca3fc2 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -192,6 +192,9 @@ static struct argp_option gf_options[] = {  	 "[default: 48]"},          {"client-pid", ARGP_CLIENT_PID_KEY, "PID", OPTION_HIDDEN,           "client will authenticate itself with process id PID to server"}, +        {"no-root-squash", ARGP_FUSE_NO_ROOT_SQUASH_KEY, "BOOL", +         OPTION_ARG_OPTIONAL, "disable/enable root squashing for the trusted " +         "client"},          {"user-map-root", ARGP_USER_MAP_ROOT_KEY, "USER", OPTION_HIDDEN,           "replace USER with root in messages"},          {"dump-fuse", ARGP_DUMP_FUSE_KEY, "PATH", 0, @@ -467,6 +470,32 @@ set_fuse_mount_options (glusterfs_ctx_t *ctx, dict_t *options)                  break;          } +        switch (cmd_args->no_root_squash) { +        case GF_OPTION_ENABLE: /* enable */ +                ret = dict_set_static_ptr (options, "no-root-squash", +                                           "enable"); +                if (ret < 0) { +                        gf_log ("glusterfsd", GF_LOG_ERROR, +                                "failed to set 'enable' for key " +                                "no-root-squash"); +                        goto err; +                } +                break; +        case GF_OPTION_DISABLE: /* disable/default */ +        default: +                ret = dict_set_static_ptr (options, "no-root-squash", +                                           "disable"); +                if (ret < 0) { +                        gf_log ("glusterfsd", GF_LOG_ERROR, +                                "failed to set 'disable' for key " +                                "no-root-squash"); +                        goto err; +                } +                gf_log ("", GF_LOG_DEBUG, "fuse no-root-squash mode %d", +                        cmd_args->no_root_squash); +                break; +        } +          if (!cmd_args->no_daemon_mode) {                  ret = dict_set_static_ptr (options, "sync-to-mount",                                             "enable"); @@ -900,6 +929,10 @@ parse_opts (int key, char *arg, struct argp_state *state)                                "unknown direct I/O mode setting \"%s\"", arg);                  break; +        case ARGP_FUSE_NO_ROOT_SQUASH_KEY: +                cmd_args->no_root_squash = _gf_true; +                break; +          case ARGP_ENTRY_TIMEOUT_KEY:                  d = 0.0; diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h index 9e2a0e56e6f..ad4c3699b56 100644 --- a/glusterfsd/src/glusterfsd.h +++ b/glusterfsd/src/glusterfsd.h @@ -84,6 +84,7 @@ enum argp_option_keys {  	ARGP_FUSE_MOUNTOPTS_KEY		  = 164,          ARGP_FUSE_USE_READDIRP_KEY        = 165,  	ARGP_AUX_GFID_MOUNT_KEY		  = 166, +        ARGP_FUSE_NO_ROOT_SQUASH_KEY      = 167,  };  struct _gfd_vol_top_priv_t {  | 
