diff options
| author | Amar Tumballi <amarts@redhat.com> | 2017-10-11 17:33:20 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2017-10-12 10:36:26 +0000 |
| commit | a3767c4ceb527cb0f52b95650c841964cf7faec9 (patch) | |
| tree | 518be95c0d473f4d4791bd88978e76510d0cfef1 /libglusterfs | |
| parent | 9422446d72bc054962d72ace9912ecb885946d49 (diff) | |
protocol-auth: use the proper validation method
Currently, server protocol's init and glusterd's option
validation methods are different, causing an issue. They
should be same for having consistent behavior
Updates #175
Change-Id: Ibbf9a18c7192b2d77f9b7675ae7da9b8d2fe5de4
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/options.c | 4 | ||||
| -rw-r--r-- | libglusterfs/src/options.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index f0292eab5d4..a0f04c772e8 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -590,7 +590,7 @@ xlator_option_validate_addr (xlator_t *xl, const char *key, const char *value, return ret; } -static int +int xlator_option_validate_addr_list (xlator_t *xl, const char *key, const char *value, volume_option_t *opt, char **op_errstr) @@ -668,7 +668,7 @@ xlator_option_validate_addr_list (xlator_t *xl, const char *key, out: if (ret) { snprintf (errstr, sizeof (errstr), "option %s %s: '%s' is not " - "a valid internet-address-list", key, value, value); + "a valid internet-address-list", key, value, value); gf_msg (xl->name, GF_LOG_ERROR, 0, LG_MSG_INVALID_ENTRY, "%s", errstr); if (op_errstr) diff --git a/libglusterfs/src/options.h b/libglusterfs/src/options.h index 1d87e051cb4..6308773a3e1 100644 --- a/libglusterfs/src/options.h +++ b/libglusterfs/src/options.h @@ -140,6 +140,11 @@ int xlator_options_validate_list (xlator_t *xl, dict_t *options, int xlator_option_validate (xlator_t *xl, char *key, char *value, volume_option_t *opt, char **op_errstr); int xlator_options_validate (xlator_t *xl, dict_t *options, char **errstr); + +int xlator_option_validate_addr_list (xlator_t *xl, const char *key, + const char *value, volume_option_t *opt, + char **op_errstr); + volume_option_t * xlator_volume_option_get (xlator_t *xl, const char *key); |