|
 |
7f4c2a |
From 64cedb3e2d282c2ef53de4b99a41574525ab4928 Mon Sep 17 00:00:00 2001
|
|
|
7f4c2a |
From: Kaushal M <kaushal@redhat.com>
|
|
|
7f4c2a |
Date: Wed, 1 Jul 2015 11:44:53 +0530
|
|
|
7f4c2a |
Subject: [PATCH 196/200] protocol/server: Correctly reconfigure auth.ssl-allow
|
|
|
7f4c2a |
|
|
|
7f4c2a |
auth.ssl-allow wasn't being handled during reconfigure. This prevented
|
|
|
7f4c2a |
the ssl-allow list from being live reloaded.
|
|
|
7f4c2a |
|
|
|
7f4c2a |
Change-Id: If3435793a5684881b012de77cb254b1847b37810
|
|
|
7f4c2a |
BUG: 1228127
|
|
|
7f4c2a |
Signed-off-by: Kaushal M <kaushal@redhat.com>
|
|
|
7f4c2a |
Reviewed-upstream-on: http://review.gluster.org/11487
|
|
|
7f4c2a |
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
7f4c2a |
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
|
|
|
7f4c2a |
Tested-by: Gluster Build System <jenkins@build.gluster.com>
|
|
|
7f4c2a |
Reviewed-on: https://code.engineering.redhat.com/gerrit/52103
|
|
|
7f4c2a |
Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
|
|
|
7f4c2a |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7f4c2a |
Tested-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
7f4c2a |
---
|
|
|
7f4c2a |
xlators/protocol/server/src/server.c | 2 ++
|
|
|
7f4c2a |
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
7f4c2a |
|
|
|
7f4c2a |
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
|
|
|
7f4c2a |
index 55b3018..9e644df 100644
|
|
|
7f4c2a |
--- a/xlators/protocol/server/src/server.c
|
|
|
7f4c2a |
+++ b/xlators/protocol/server/src/server.c
|
|
|
7f4c2a |
@@ -616,6 +616,7 @@ _delete_auth_opt (dict_t *this, char *key, data_t *value, void *data)
|
|
|
7f4c2a |
{
|
|
|
7f4c2a |
char *auth_option_pattern[] = { "auth.addr.*.allow",
|
|
|
7f4c2a |
"auth.addr.*.reject",
|
|
|
7f4c2a |
+ "auth.login.*.ssl-allow",
|
|
|
7f4c2a |
NULL};
|
|
|
7f4c2a |
int i = 0;
|
|
|
7f4c2a |
|
|
|
7f4c2a |
@@ -635,6 +636,7 @@ _copy_auth_opt (dict_t *unused, char *key, data_t *value, void *xl_dict)
|
|
|
7f4c2a |
{
|
|
|
7f4c2a |
char *auth_option_pattern[] = { "auth.addr.*.allow",
|
|
|
7f4c2a |
"auth.addr.*.reject",
|
|
|
7f4c2a |
+ "auth.login.*.ssl-allow",
|
|
|
7f4c2a |
NULL};
|
|
|
7f4c2a |
int i = 0;
|
|
|
7f4c2a |
|
|
|
7f4c2a |
--
|
|
|
7f4c2a |
1.7.1
|
|
|
7f4c2a |
|