diff options
| author | Kaushal M <kaushal@redhat.com> | 2012-04-09 12:17:16 +0530 | 
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-04-13 00:55:51 -0700 | 
| commit | 28f373d89fba7266473c952d9c2bf6ec5f02628c (patch) | |
| tree | 9ae99010e5c2d2add91f4d510d0f2a321d9cee04 /xlators/protocol | |
| parent | b19a7fee17ddedfc6692deb5a8dc8df927a2cf7b (diff) | |
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 <kaushal@redhat.com>
Reviewed-on: http://review.gluster.com/3104
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/server/src/server.c | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index b46398afb..c54c34091 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;  }  | 
