Cluster Project branch, STABLE2, updated. cluster-2.02.00-25-g0e05f55

Cluster Project branch, STABLE2, updated. cluster-2.02.00-25-g0e05f55

[lhh]

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=0e05f5554afe6b24a4cc28afcfc8d46fa7ca1814

The branch, STABLE2 has been updated
       via  0e05f5554afe6b24a4cc28afcfc8d46fa7ca1814 (commit)
      from  025b0b4a525b5f5b72f8a583ff89bedb5ee738a8 (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 0e05f5554afe6b24a4cc28afcfc8d46fa7ca1814
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Mar 20 17:25:02 2008 -0400

    [cman] Apply missing fix for #315711

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

Summary of changes:
 group/dlm_controld/member_cman.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/group/dlm_controld/member_cman.c b/group/dlm_controld/member_cman.c
index 6fb5c4f..1ce180c 100644
--- a/group/dlm_controld/member_cman.c
+++ b/group/dlm_controld/member_cman.c
@@ -84,6 +84,14 @@ static void statechange(void)
 		return;
 	}
 
+	/* Never allow node ID 0 to be considered a member #315711 */
+	for (i = 0; i < cman_node_count; i++) {
+		if (cman_nodes[i].cn_nodeid == 0) {
+			cman_nodes[i].cn_member = 0;
+			break;
+		}
+	}
+
 	for (i = 0; i < old_node_count; i++) {
 		if (old_nodes[i].cn_member &&
 		    !is_cman_member(old_nodes[i].cn_nodeid)) {


hooks/post-receive
--
Cluster Project