diff options
| author | Amar Tumballi <amarts@redhat.com> | 2017-10-11 17:33:20 +0530 |
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2017-10-25 11:35:25 +0000 |
| commit | d7006089177d4ff73674ebe84ace651a3457f358 (patch) | |
| tree | 8a8a80618eaf36b09dc97650450ff1c1b32bea48 /libglusterfs | |
| parent | 19fe3906c13ad360c07bb94db6b7f63024b30ef1 (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
Change-Id: Ibbf9a18c7192b2d77f9b7675ae7da9b8d2fe5de4
BUG: 1501315
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 3154dcefc02..d259d44a263 100644 --- a/libglusterfs/src/options.h +++ b/libglusterfs/src/options.h @@ -87,6 +87,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); |