diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 17:00:14 +0000 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2014-01-14 17:00:14 +0000 |
| commit | 455791f265e6e581fa4ebddd5dc4642b2201f8ce (patch) | |
| tree | ebd5cad9534291822f8c47dbbc8162525f8fe92e /xlators/protocol/server/src | |
| parent | 92eaa72ea4cd0d06c2161842c548008db0eee01c (diff) | |
| parent | 7d89ec77763dc5076379753c736f7fce2bedd9ec (diff) | |
Merge branch 'upstream' into merge
Diffstat (limited to 'xlators/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 34 |
2 files changed, 28 insertions, 10 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 138e601ce..d43571e87 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -2265,7 +2265,7 @@ server_finodelk_resume (call_frame_t *frame, xlator_t *bound_xl) GF_UNUSED int ret = -1; server_state_t *state = NULL; - gf_log (bound_xl->name, GF_LOG_WARNING, "frame %p, xlator %p", + gf_log (bound_xl->name, GF_LOG_DEBUG, "frame %p, xlator %p", frame, bound_xl); state = CALL_STATE (frame); @@ -2298,7 +2298,7 @@ server_inodelk_resume (call_frame_t *frame, xlator_t *bound_xl) GF_UNUSED int ret = -1; server_state_t *state = NULL; - gf_log (bound_xl->name, GF_LOG_WARNING, "frame %p, xlator %p", + gf_log (bound_xl->name, GF_LOG_DEBUG, "frame %p, xlator %p", frame, bound_xl); state = CALL_STATE (frame); diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 702deaa45..56b83cb9a 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -770,7 +770,7 @@ client_destroy_cbk (xlator_t *this, client_t *client) server_ctx_t *ctx = NULL; client_ctx_del (client, this, &tmp); - + ctx = tmp; if (ctx == NULL) @@ -1052,10 +1052,26 @@ struct volume_options options[] = { { .key = {"root-squash"}, .type = GF_OPTION_TYPE_BOOL, .default_value = "off", - .description = "Map requests from uid/gid 0 to the anonymous " - "uid/gid. Note that this does not apply to any other" - "uids or gids that might be equally sensitive, such as" - "user bin or group staff." + .description = "Map requests from uid/gid 0 to the anonymous " + "uid/gid. Note that this does not apply to any other " + "uids or gids that might be equally sensitive, such " + "as user bin or group staff." + }, + { .key = {"anonuid"}, + .type = GF_OPTION_TYPE_INT, + .default_value = "65534", /* RPC_NOBODY_UID */ + .min = 0, + .max = (uint32_t) -1, + .description = "value of the uid used for the anonymous " + "user/nfsnobody when root-squash is enabled." + }, + { .key = {"anongid"}, + .type = GF_OPTION_TYPE_INT, + .default_value = "65534", /* RPC_NOBODY_GID */ + .min = 0, + .max = (uint32_t) -1, + .description = "value of the gid used for the anonymous " + "user/nfsnobody when root-squash is enabled." }, { .key = {"statedump-path"}, .type = GF_OPTION_TYPE_PATH, @@ -1085,13 +1101,15 @@ struct volume_options options[] = { { .key = {"auth.addr.*.allow"}, .type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST, .description = "Allow a comma separated list of addresses and/or " - "hostnames to connect to the server. By default, all" - " connections are allowed." + "hostnames to connect to the server. Option " + "auth.reject overrides this option. By default, all " + "connections are allowed." }, { .key = {"auth.addr.*.reject"}, .type = GF_OPTION_TYPE_INTERNET_ADDRESS_LIST, .description = "Reject a comma separated list of addresses and/or " - "hostnames to connect to the server. By default, all" + "hostnames to connect to the server. This option " + "overrides the auth.allow option. By default, all" " connections are allowed." }, |