summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorKaushal M <kaushal@redhat.com>2015-07-01 11:44:53 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-07-06 00:14:22 -0700
commitd8fed39922e54d7abe45963090f9f621262b086d (patch)
treee54575b6e9480b935aa409ed1ebd21fa8002b14c /xlators/protocol
parent4df4c2092478a9813b6bb4b4ee00ed8f4ca2fea0 (diff)
protocol/server: Correctly reconfigure auth.ssl-allow
Backport of https://review.gluster.org/11487 auth.ssl-allow wasn't being handled during reconfigure. This prevented the ssl-allow list from being live reloaded. Change-Id: If3435793a5684881b012de77cb254b1847b37810 BUG: 1238073 Signed-off-by: Kaushal M <kaushal@redhat.com> Reviewed-on: http://review.gluster.org/11492 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/protocol')
-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 b4c3c61a583..9c10a50d4c7 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -616,6 +616,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;
@@ -635,6 +636,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;