cluster: master - cman: fix sockaddr address aliasing in cman-preconfig

cluster: master - cman: fix sockaddr address aliasing in cman-preconfig

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=80a26988a9c5db62d84cb44b290c06867bab940b
Commit:        80a26988a9c5db62d84cb44b290c06867bab940b
Parent:        29df84c7347ac55c23f7f31599c979083984303e
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Thu Mar 12 16:29:20 2009 +0000
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Thu Mar 12 16:29:20 2009 +0000

cman: fix sockaddr address aliasing in cman-preconfig

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 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;