From 4c87d30724b29a83c6a0f4a101468824fa76ac19 Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Sat, 4 Sep 2010 01:11:34 +0000 Subject: Volume create hostname should not be localhost volume create hostname should not be localhost or 127.0.0.1. It should be a valid nodeid or ip. This will prevent invalid vol files being created on glusterd's when localhost or 127.0.0.1 is specified Signed-off-by: shishir gowda Signed-off-by: Vijay Bellur BUG: 1505 (volume create/add-brick requires ip or hostname for localhost) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1505 --- cli/src/cli-cmd-parser.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'cli/src/cli-cmd-parser.c') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index fb3b162d1e7..cf9357c4128 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -52,6 +52,9 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options char *tmp_list = NULL; char *tmpptr = NULL; int j = 0; + char *host_name = NULL; + char *tmp = NULL; + char *freeptr = NULL; GF_ASSERT (words); GF_ASSERT (options); @@ -164,6 +167,26 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options ret = -1; goto out; } + + host_name = gf_strdup(words[brick_index]); + if (!host_name) { + ret = -1; + gf_log("cli",GF_LOG_ERROR, "Unable to allocate " + "memory"); + goto out; + } + freeptr = host_name; + + strtok_r(host_name, ":", &tmp); + if (!(strcmp(host_name, "localhost") && + strcmp (host_name, "127.0.0.1"))) { + cli_out ("Please provide a valid hostname/ip other " + "localhost or 127.0.0.1"); + ret = -1; + GF_FREE(freeptr); + goto out; + } + GF_FREE (freeptr); tmp_list = strdup(brick_list+1); j = 0; while(( brick_count != 0) && (j < brick_count)) { -- cgit