From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 486 invoked by alias); 4 Feb 2009 11:31:03 -0000 Received: (qmail 480 invoked by alias); 4 Feb 2009 11:31:03 -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: STABLE3 - cman: don't display the last node name if we can't get an 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: dc8f60c70f13374a1e1e2dcb242a357ac454f247 X-Git-Newrev: 34fe18a15b5147c4444510e0eddc80a5ce16a11e From: Christine Caulfield Message-Id: <20090204113043.788FB1205B2@lists.fedorahosted.org> Date: Wed, 04 Feb 2009 11:31: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/msg00377.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=34fe18a15b5147c4444510e0eddc80a5ce16a11e Commit: 34fe18a15b5147c4444510e0eddc80a5ce16a11e Parent: dc8f60c70f13374a1e1e2dcb242a357ac454f247 Author: Christine Caulfield AuthorDate: Wed Feb 4 11:29:31 2009 +0000 Committer: Christine Caulfield CommitterDate: Wed Feb 4 11:29:31 2009 +0000 cman: don't display the last node name if we can't get an address cman_get_node_addrs can return success but 0 node addresses. This confused cman_tool into displaying the same node name twice. Signed-off-by: Christine Caulfield --- cman/cman_tool/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index b6e366d..87e52d3 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -376,7 +376,7 @@ static void print_node(commandline_t *comline, cman_handle_t h, int *format, str * (we really don't want corosync to look up names in DNS so it invents them) */ if (sscanf(node->cn_name, "Node%d", &tmpid) == 1 && tmpid == node->cn_nodeid) { - if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs)) { + if (!cman_get_node_addrs(h, node->cn_nodeid, MAX_INTERFACES, &numaddrs, addrs) && numaddrs) { getnameinfo((struct sockaddr *)addrs[0].cna_address, addrs[0].cna_addrlen, node->cn_name, sizeof(node->cn_name), NULL, 0, NI_NAMEREQD); } }