summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2015-07-01 11:44:53 +0530
committerRaghavendra Bhat <raghavendra@redhat.com>2015-07-10 00:17:01 -0700
commit96987f8e582667defff313e84f85011bff927d3b (patch)
tree055ce0c3c925c62f60c6bf4f89868fe42f77777a
parentd86a238f29c1519bad37bd38d12227bd69d1947f (diff)
protocol/server: Correctly reconfigure auth.ssl-allow
auth.ssl-allow wasn't being handled during reconfigure. This prevented the ssl-allow list from being live reloaded. Change-Id: If3435793a5684881b012de77cb254b1847b37810 BUG: 1238074 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/11493 Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
-rw-r--r--xlators/protocol/server/src/server.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index a511540cac6..03b06f45c8f 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -595,6 +595,7 @@ _delete_auth_opt (dict_t *this, char *key, data_t *value, void *data)
{
char *auth_option_pattern[] = { "auth.addr.*.allow",
"auth.addr.*.reject",
+ "auth.login.*.ssl-allow",
NULL};
int i = 0;
@@ -614,6 +615,7 @@ _copy_auth_opt (dict_t *unused, char *key, data_t *value, void *xl_dict)
{
char *auth_option_pattern[] = { "auth.addr.*.allow",
"auth.addr.*.reject",
+ "auth.login.*.ssl-allow",
NULL};
int i = 0;