CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL4
Changes by: pcaulfield@sourceware.org 2008-01-11 14:22:11

Modified files:
cman/cman_tool : join_ccs.c

Log message:
Always use the nodename in cluster.conf for cluster name.
bz#428219

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/join_ccs.c.diff?cvsroot=cluster&only_with_tag=RHEL 4&r1=1.7.2.8&r2=1.7.2.9

--- cluster/cman/cman_tool/Attic/join_ccs.c 2006/12/18 13:37:55 1.7.2.8
+++ cluster/cman/cman_tool/Attic/join_ccs.c 2008/01/11 14:22:11 1.7.2.9
@@ -118,8 +118,8 @@

if (strlen(nodename2) == strlen(nodename3) &&
!strncmp(nodename2, nodename3, strlen(nodename3))) {
+ strcpy(nodename, str);
free(str);
- strcpy(nodename, nodename3);
return 0;
}

CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL46
Changes by: pcaulfield@sourceware.org 2008-01-11 14:24:19

Modified files:
cman/cman_tool : join_ccs.c

Log message:
Always the node name from cluster.conf as the node name.
Fix fixes fencing and routing problems too in some circumstances.
bz#428219

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/join_ccs.c.diff?cvsroot=cluster&only_with_tag=RHEL 46&r1=1.7.2.8&r2=1.7.2.8.4.1

--- cluster/cman/cman_tool/Attic/join_ccs.c 2006/12/18 13:37:55 1.7.2.8
+++ cluster/cman/cman_tool/Attic/join_ccs.c 2008/01/11 14:24:19 1.7.2.8.4.1
@@ -118,8 +118,8 @@

if (strlen(nodename2) == strlen(nodename3) &&
!strncmp(nodename2, nodename3, strlen(nodename3))) {
+ strcpy(nodename, str);
free(str);
- strcpy(nodename, nodename3);
return 0;
}