summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server/src/server.c
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2018-01-19 03:54:02 -0500
committerAtin Mukherjee <amukherj@redhat.com>2018-01-22 11:19:16 +0000
commit0c1eb282aad1a8b210b2f77efe57a3c35c4bee70 (patch)
treedb7058de59063cd2d575336e6eedfbeea6eba1fe /xlators/protocol/server/src/server.c
parentb1abe3c1baa5c132d32f7c6eedf3f9255534ed37 (diff)
protocol/server: Fix "auth-path" in options table
Options set will crash the brick with glusterd2. glusterd used to set "auth-path" during volfile generation. With glusterd2, it should come from options table. Updates: #302 Change-Id: Ie41a17779c185b87ace7e0bce0d0ba594b415a75 Signed-off-by: Kotresh HR <khiremat@redhat.com>
Diffstat (limited to 'xlators/protocol/server/src/server.c')
-rw-r--r--xlators/protocol/server/src/server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index 6612231..bae4a11 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1815,6 +1815,11 @@ struct volume_options server_options[] = {
"overrides the auth.allow option. By default, all"
" connections are allowed."
},
+ /* This is not a valid path w.r.t daemons, hence it's string */
+ { .key = {"auth-path"},
+ .type = GF_OPTION_TYPE_STR,
+ .default_value = "{{ brick.path }}"
+ },
{ .key = {"rpc.outstanding-rpc-limit"},
.type = GF_OPTION_TYPE_INT,
.min = RPCSVC_MIN_OUTSTANDING_RPC_LIMIT,