diff options
Diffstat (limited to 'xlators/protocol/server/src/server.c')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 10 | 
1 files changed, 6 insertions, 4 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 702deaa4545..1e23630c2f6 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) @@ -1085,13 +1085,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."          },  | 
