[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-15-gc1f442a

[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-15-gc1f442a

[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=c1f442a049bc5f7369ff5c88a834dab2e9b09251

The branch, RHEL5 has been updated
       via  c1f442a049bc5f7369ff5c88a834dab2e9b09251 (commit)
      from  1bb513e542a4ca7f3e79f5000b0bb0783a41b0b5 (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 c1f442a049bc5f7369ff5c88a834dab2e9b09251
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 ebef48f..53ba72f 100644
--- a/group/dlm_controld/member_cman.c
+++ b/group/dlm_controld/member_cman.c
@@ -81,6 +81,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