From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 775 invoked by alias); 4 Feb 2009 10:26:29 -0000 Received: (qmail 769 invoked by alias); 4 Feb 2009 10:26:29 -0000 X-SWARE-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.6 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: master - cman: Fix name resolving. To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 1004eb573e03ec684b2a73199cf7d94cb8cce8f6 X-Git-Newrev: 6f5b61f3e93595788cffe162994212572d348ca5 From: Christine Caulfield Message-Id: <20090204102604.4EB1C1205B2@lists.fedorahosted.org> Date: Wed, 04 Feb 2009 10:26: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-q1/txt/msg00376.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=6f5b61f3e93595788cffe162994212572d348ca5 Commit: 6f5b61f3e93595788cffe162994212572d348ca5 Parent: 1004eb573e03ec684b2a73199cf7d94cb8cce8f6 Author: Christine Caulfield AuthorDate: Wed Feb 4 10:25:40 2009 +0000 Committer: Christine Caulfield CommitterDate: Wed Feb 4 10:25:40 2009 +0000 cman: Fix name resolving. corosync success is CS_OK, not 0! Signed-off-by: Christine Caulfield --- cman/services/cman/lib/libcman.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cman/services/cman/lib/libcman.c b/cman/services/cman/lib/libcman.c index 7a25a9d..09ca151 100644 --- a/cman/services/cman/lib/libcman.c +++ b/cman/services/cman/lib/libcman.c @@ -1087,10 +1087,12 @@ int cman_get_nodes(cman_handle_t handle, int maxnodes, int *retnodes, cman_node_ for (i=0; i < cman_inst->node_count; i++) { nodes[i].cn_nodeid = cman_inst->node_list[i].nodeid; nodes[i].cn_member = 1; + name = NULL; error = corosync_cfg_get_node_addrs(cman_inst->cfg_handle, nodes[i].cn_nodeid, max_addrs, &num_addrs, addrs); - if (!error) + if (error == CS_OK) { name = node_name(&addrs[0]); + } if (name) { sprintf(nodes[i].cn_name, "%s", name); }