cluster: STABLE3 - cman: Fix some compile-time warning

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8a1df5b0bc701fca57996e766ea54c26f48874ea
Commit:        8a1df5b0bc701fca57996e766ea54c26f48874ea
Parent:        26ec8a8072a5bc9b4f74ed1075460fc9bd27cbd2
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Tue Jun 23 08:42:25 2009 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Tue Jun 23 08:42:25 2009 +0100

cman: Fix some compile-time warning

Actually one of those warnings was a bug that would prevent cross-endian
clusters working.

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/daemon/ais.c      |    2 ++
 cman/daemon/commands.c |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
index 3b0a2db..ffea8c2 100644
--- a/cman/daemon/ais.c
+++ b/cman/daemon/ais.c
@@ -258,6 +258,8 @@ static void cman_deliver_fn(unsigned int nodeid, const void *msg, unsigned int m
 		header.srcid = swab32(original_header->srcid);
 		header.tgtid = swab32(original_header->tgtid);
 		header.flags = swab32(original_header->flags);
+		header.srcport = original_header->srcport;
+		header.tgtport = original_header->tgtport;
 	} 
 	else {
 	        memcpy(&header, original_header, sizeof(header));
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index b343bcb..2eb8101 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -581,7 +581,7 @@ static int do_cmd_get_extrainfo(char *cmdbuf, char **retbuf, int retsize, int *r
 			objdb_get_string(corosync, object_handle, "mcastaddr", &mcast);
 			/* If this fails, it must be using broadcast*/
 			if (!mcast)
-				mcast = "255.255.255.255";
+				mcast = (char*)"255.255.255.255";
 			memset(ptr, 0, sizeof(struct sockaddr_storage));
 
 			saddr4 = (struct sockaddr_in *)ptr;