Cluster Project branch, master, updated. gfs-kernel_0_1_22-175-g2bc77b7

[ccaulfield@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=2bc77b7c45e9d74eb245a10f454e3041f61a1e7f

The branch, master has been updated
       via  2bc77b7c45e9d74eb245a10f454e3041f61a1e7f (commit)
      from  f1879119019bea3029f852a7248101c397777dbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2bc77b7c45e9d74eb245a10f454e3041f61a1e7f
Author: Christine Caulfield <ccaulfie@redhat.com>
Date:   Wed Apr 16 12:54:36 2008 +0100

    [MISC] Make it build with gcc 4.3
    
    A few files now need to include <limits.h> and cman
    was using an illegal access into the sockaddr_in6 structure.
    
    Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 ccs/daemon/cnx_mgr.c                 |    1 +
 cman/daemon/cman-preconfig.c         |    2 +-
 cman/lib/libcman.c                   |    1 +
 dlm/tool/main.c                      |    1 +
 gnbd/tools/gnbd_export/gnbd_export.c |    1 +
 gnbd/tools/gnbd_import/gnbd_import.c |    1 +
 group/gfs_controld/lock_dlm.h        |    1 +
 7 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ccs/daemon/cnx_mgr.c b/ccs/daemon/cnx_mgr.c
index 9fed1bb..a2011af 100644
--- a/ccs/daemon/cnx_mgr.c
+++ b/ccs/daemon/cnx_mgr.c
@@ -23,6 +23,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <time.h>
+#include <limits.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index ba114bc..38f2834 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -753,7 +753,7 @@ static int set_noccs_defaults(struct objdb_iface_ver0 *objdb)
 		}
 		if (ainfo->ai_family == AF_INET6) {
 			struct sockaddr_in6 *addr = (struct sockaddr_in6 *)ainfo->ai_addr;
-			memcpy(&nodeid, &addr->sin6_addr.in6_u.u6_addr32[3], sizeof(int));
+			memcpy(&nodeid, &addr->sin6_addr.s6_addr32[3], sizeof(int));
 		}
 		log_printf(LOG_INFO, "Our Node ID is %d\n", nodeid);
 		freeaddrinfo(ainfo);
diff --git a/cman/lib/libcman.c b/cman/lib/libcman.c
index 7b28dc1..7229342 100644
--- a/cman/lib/libcman.c
+++ b/cman/lib/libcman.c
@@ -30,6 +30,7 @@
 #include <netinet/in.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include "cnxman-socket.h"
 #include "libcman.h"
 
diff --git a/dlm/tool/main.c b/dlm/tool/main.c
index 330d795..814a3bb 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -21,6 +21,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include <netinet/in.h>
 
 #include "libdlm.h"
diff --git a/gnbd/tools/gnbd_export/gnbd_export.c b/gnbd/tools/gnbd_export/gnbd_export.c
index a7b14f5..633cc5c 100644
--- a/gnbd/tools/gnbd_export/gnbd_export.c
+++ b/gnbd/tools/gnbd_export/gnbd_export.c
@@ -24,6 +24,7 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 #include <dirent.h>
+#include <limits.h>
 #include <ctype.h>
 #define _GNU_SOURCE
 #include <getopt.h>
diff --git a/gnbd/tools/gnbd_import/gnbd_import.c b/gnbd/tools/gnbd_import/gnbd_import.c
index cf4e869..8eb4ef2 100644
--- a/gnbd/tools/gnbd_import/gnbd_import.c
+++ b/gnbd/tools/gnbd_import/gnbd_import.c
@@ -22,6 +22,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <limits.h>
 #include <dirent.h>
 #include <netdb.h>
 #include <arpa/inet.h>
diff --git a/group/gfs_controld/lock_dlm.h b/group/gfs_controld/lock_dlm.h
index 7b514df..6d31162 100644
--- a/group/gfs_controld/lock_dlm.h
+++ b/group/gfs_controld/lock_dlm.h
@@ -24,6 +24,7 @@
 #include <time.h>
 #include <syslog.h>
 #include <sched.h>
+#include <limits.h>
 #include <asm/types.h>
 #include <sys/socket.h>
 #include <sys/poll.h>


hooks/post-receive
--
Cluster Project