From 28f373d89fba7266473c952d9c2bf6ec5f02628c Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Mon, 9 Apr 2012 12:17:16 +0530 Subject: xlator/server,xlator/nfs : Fix authentication for address lists Fixes authentication problems when address lists are given for auth.{allow,reject} and nfs.rpc-auth-{allow,reject}. Change-Id: I9959ebfa6820aef52c883372e1085660560e1e73 BUG: 810179 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.com/3104 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi Reviewed-by: Vijay Bellur --- xlators/protocol/server/src/server.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'xlators/protocol') diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index b46398af..c54c3409 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -539,6 +539,7 @@ validate_auth_options (xlator_t *this, dict_t *dict) xlator_list_t *trav = NULL; data_pair_t *pair = NULL; char *tail = NULL; + char *tmp_addr_list = NULL; char *addr = NULL; char *tmp_str = NULL; @@ -574,7 +575,8 @@ validate_auth_options (xlator_t *this, dict_t *dict) goto out; } - addr = strtok_r (pair->value->data, ",", + tmp_addr_list = gf_strdup (pair->value->data); + addr = strtok_r (tmp_addr_list, ",", &tmp_str); if (!addr) addr = pair->value->data; @@ -600,6 +602,8 @@ validate_auth_options (xlator_t *this, dict_t *dict) addr = NULL; } + GF_FREE (tmp_addr_list); + tmp_addr_list = NULL; } } @@ -615,6 +619,8 @@ validate_auth_options (xlator_t *this, dict_t *dict) } out: + if (tmp_addr_list) + GF_FREE (tmp_addr_list); return error; } -- cgit