Cluster Project branch, STABLE2, updated. cluster-2.03.00-18-g438d70d
fabbione@sourceware.org
fabbione@sourceware.org
Wed Apr 16 14:46:00 GMT 2008
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=438d70d1558005acd49539449e6ea54a22152a7b
The branch, STABLE2 has been updated
via 438d70d1558005acd49539449e6ea54a22152a7b (commit)
via bd69a108740417366f67e1c2f589e99a0f74dc53 (commit)
via ebe9193279336f0ed37eb242bea4e74638ee1a39 (commit)
from ebdcd110c758fe0c95285708626f02d7d67c1258 (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 438d70d1558005acd49539449e6ea54a22152a7b
Author: Fabio M. Di Nitto <fabbione@daitarn-fedora.int.fabbione.net>
Date: Wed Apr 16 16:08:44 2008 +0200
[RGMANAGER] Fix build with gcc4.3
Signed-off-by: Fabio M. Di Nitto <fabbione@daitarn-fedora.int.fabbione.net>
commit bd69a108740417366f67e1c2f589e99a0f74dc53
Author: Christine Caulfield <ccaulfie@redhat.com>
Date: Wed Apr 16 13:12:10 2008 +0100
[FENCE] Make it build with gcc 4.3
fence_tool.c also needs <limits.h>
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
commit ebe9193279336f0ed37eb242bea4e74638ee1a39
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>
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
-----------------------------------------------------------------------
Summary of changes:
ccs/daemon/cnx_mgr.c | 1 +
cman/daemon/cmanccs.c | 3 ++-
cman/lib/libcman.c | 1 +
dlm/tool/main.c | 1 +
fence/fence_tool/fence_tool.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 +
rgmanager/ChangeLog | 3 +++
rgmanager/src/utils/clustat.c | 2 +-
10 files changed, 13 insertions(+), 2 deletions(-)
mode change 100644 => 100755 scripts/define2var
mode change 100644 => 100755 scripts/uninstall.pl
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/cmanccs.c b/cman/daemon/cmanccs.c
index a901df2..2bfc299 100644
--- a/cman/daemon/cmanccs.c
+++ b/cman/daemon/cmanccs.c
@@ -22,6 +22,7 @@
#include <sys/errno.h>
#include <netdb.h>
#include <ifaddrs.h>
+#include <limits.h>
#include <openais/service/swab.h>
@@ -890,7 +891,7 @@ static int noccs_defaults()
}
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 190ad0b..d4e4979 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/fence/fence_tool/fence_tool.c b/fence/fence_tool/fence_tool.c
index ab737e5..2d193ea 100644
--- a/fence/fence_tool/fence_tool.c
+++ b/fence/fence_tool/fence_tool.c
@@ -24,6 +24,7 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <fcntl.h>
+#include <limits.h>
#include <errno.h>
#include <libgen.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>
diff --git a/rgmanager/ChangeLog b/rgmanager/ChangeLog
index 117e5a3..2387815 100644
--- a/rgmanager/ChangeLog
+++ b/rgmanager/ChangeLog
@@ -1,3 +1,6 @@
+2008-04-16 Fabio M. Di Nitto <fabbione at fabbione.net>
+ * src/utils/clustat.c: Fix variable init
+
2008-03-04 Lon Hohberger <lhh at redhat.com>
* src/resources/ASEHAagent.sh, Makefile: Add Sybase failover agent
* src/resources/oracledb.sh, Makefile: Add Oracle 10g failover agent
diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index ed9b29b..dd64ce0 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -835,7 +835,7 @@ txt_cluster_status(cman_cluster_t *ci,
rg_state_list_t *rgs, char *name, char *svcname,
int flags)
{
- int ret;
+ int ret = 0;
if (!svcname && !name) {
txt_cluster_info(ci);
diff --git a/scripts/define2var b/scripts/define2var
old mode 100644
new mode 100755
diff --git a/scripts/uninstall.pl b/scripts/uninstall.pl
old mode 100644
new mode 100755
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list