cluster: STABLE3 - cman: Improve error message when the hostname resolves to 127.0.0.1

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c0b...
Commit:        c0b0ebc61541195890914126ac92d91ba625e824
Parent:        8d8de2f9eb192684fce8a3f773fb1176d83cfa7f
Author:        Christine Caulfield 
AuthorDate:    Thu Oct 29 07:44:39 2009 +0000
Committer:     Christine Caulfield 
CommitterDate: Thu Oct 29 07:44:39 2009 +0000

cman: Improve error message when the hostname resolves to 127.0.0.1

Signed-off-by: Christine Caulfield 
---
 cman/cman_tool/join.c        |    2 +-
 cman/daemon/cman-preconfig.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c
index 8e85a58..fa1920e 100644
--- a/cman/cman_tool/join.c
+++ b/cman/cman_tool/join.c
@@ -234,7 +234,7 @@ int join(commandline_t *comline, char *main_envp[])
    	be_daemon();

sprintf(scratch, "FORKED: %d\n", getpid());
-		err = write(p[1], scratch, strlen(scratch)+1);
+		err = write(p[1], scratch, strlen(scratch));

execve(COROSYNCBIN, argv, envp);

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 4bd3d95..110fa92 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -237,7 +237,7 @@ static int add_ifaddr(struct objdb_iface_ver0 *objdb, char *mcast, char *ifaddr,
    /* Check it's not bound to localhost, sigh */
    get_localhost(if_addr.ss_family, &localhost);
    if (ipaddr_equal(&localhost, &if_addr)) {
-		sprintf(error_reason, "Node address is localhost, please choose a real host address");
+		sprintf(error_reason, "Node name resolves to localhost, please check /etc/hosts and assign this node a network IP address");
    	return -1;
    }