From f7fcbc0ffe0e56f81f73f99e0d4825cd95ca0014 Mon Sep 17 00:00:00 2001 From: Varun Shastry Date: Mon, 9 Dec 2013 17:51:40 +0530 Subject: mgmt/glusterd: Improve the description in volume set help output Change-Id: I785648970f53033a69922c23110b5eea9e47feb3 BUG: 1046030 Signed-off-by: Varun Shastry Reviewed-on: http://review.gluster.org/6573 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/protocol/server/src/server.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'xlators/protocol/server/src/server.c') diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index a797a0d6cb1..56b83cb9a90 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) @@ -1101,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." }, -- cgit