From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23525 invoked by alias); 15 Jun 2009 08:34:13 -0000 Received: (qmail 23518 invoked by alias); 15 Jun 2009 08:34:13 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman: Catch failure to determine default multicast address To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 2236b1a9a6d0f64954dff0ba36930e4f93819a3f X-Git-Newrev: e34576fbcb9d489d8e4c2e78c9b57e2f68ac18d3 From: Christine Caulfield Message-Id: <20090615083340.29219120375@lists.fedorahosted.org> Date: Mon, 15 Jun 2009 08:34:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00523.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=e34576fbcb9d489d8e4c2e78c9b57e2f68ac18d3 Commit: e34576fbcb9d489d8e4c2e78c9b57e2f68ac18d3 Parent: 2236b1a9a6d0f64954dff0ba36930e4f93819a3f Author: Christine Caulfield AuthorDate: Mon Jun 15 09:32:14 2009 +0100 Committer: Christine Caulfield CommitterDate: Mon Jun 15 09:32:14 2009 +0100 cman: Catch failure to determine default multicast address default_mcast() can fail if it can't determine the IP version of the local host address. eg it might tbe ambiguous or not available in the hosts file for some strange reason Signed-off-by: Christine Caulfield --- cman/daemon/cman-preconfig.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c index 05c8f71..1dc7a26 100644 --- a/cman/daemon/cman-preconfig.c +++ b/cman/daemon/cman-preconfig.c @@ -590,7 +590,10 @@ static int get_nodename(struct objdb_iface_ver0 *objdb) if (!mcast_name) { mcast_name = default_mcast(nodename, cluster_id); + } + if (!mcast_name) + return -1; /* See if the user wants our default set of openais services (default=yes) */ objdb_get_int(objdb, object_handle, "disable_openais", &disable_openais, 0);