From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28080 invoked by alias); 12 Mar 2009 16:30:31 -0000 Received: (qmail 27592 invoked by alias); 12 Mar 2009 16:30:26 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_66,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: cluster: master - cman: fix sockaddr address aliasing in cman-preconfig 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: 29df84c7347ac55c23f7f31599c979083984303e X-Git-Newrev: 80a26988a9c5db62d84cb44b290c06867bab940b From: Christine Caulfield Message-Id: <20090312162945.A4FC0120198@lists.fedorahosted.org> Date: Thu, 12 Mar 2009 16:30: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/msg00765.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=80a26988a9c5db62d84cb44b290c06867bab940b Commit: 80a26988a9c5db62d84cb44b290c06867bab940b Parent: 29df84c7347ac55c23f7f31599c979083984303e Author: Christine Caulfield AuthorDate: Thu Mar 12 16:29:20 2009 +0000 Committer: Christine Caulfield CommitterDate: Thu Mar 12 16:29:20 2009 +0000 cman: fix sockaddr address aliasing in cman-preconfig Signed-off-by: Christine Caulfield --- cman/config/cman-preconfig.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cman/config/cman-preconfig.c b/cman/config/cman-preconfig.c index c9c109b..0af128b 100644 --- a/cman/config/cman-preconfig.c +++ b/cman/config/cman-preconfig.c @@ -117,13 +117,13 @@ static int ipaddr_equal(struct sockaddr_storage *addr1, struct sockaddr_storage struct sockaddr *saddr1 = (struct sockaddr *)addr1; struct sockaddr *saddr2 = (struct sockaddr *)addr2; - if (saddr1->sa_family != saddr2->sa_family) + if (addr1->ss_family != addr2->ss_family) return 0; - if (saddr1->sa_family == AF_INET) { + if (addr1->ss_family == AF_INET) { addrlen = sizeof(struct sockaddr_in); } - if (saddr1->sa_family == AF_INET6) { + if (addr1->ss_family == AF_INET6) { addrlen = sizeof(struct sockaddr_in6); } assert(addrlen); @@ -971,7 +971,7 @@ static int set_noccs_defaults(struct objdb_iface_ver0 *objdb) } /* Move an object/key tree */ -static int copy_config_tree(struct objdb_iface_ver0 *objdb, hdb_handle_t source_object, hdb_handle_t target_parent_object, int always_create) +static int copy_config_tree(struct objdb_iface_ver0 *objdb, hdb_handle_t source_object, hdb_handle_t target_parent_object, int always_create) { hdb_handle_t object_handle; hdb_handle_t new_object;