[Cluster-devel] cluster/cman/daemon cmanccs.c

[pcaulfield@sourceware.org <pcaulfield@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL51
Changes by:	pcaulfield at sourceware.org	2007-08-17 07:51:03

Modified files:
	cman/daemon    : cmanccs.c 

Log message:
	bz#250688
	Don't lose the cluster name if it's specified on the cman_tool command line.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/cmanccs.c.diff?cvsroot=cluster&only_with_tag=RHEL51&r1=1.21.2.4&r2=1.21.2.4.2.1

--- cluster/cman/daemon/cmanccs.c	2007/05/23 10:31:00	1.21.2.4
+++ cluster/cman/daemon/cmanccs.c	2007/08/17 07:51:03	1.21.2.4.2.1
@@ -424,9 +424,9 @@
 			write_cman_pipe("Cluster name in CCS does not match that passed to cman_tool");
 			return -ENOENT;
 		}
-	} else {
-		strcpy(cluster_name, str);
 	}
+
+	strcpy(cluster_name, str);
 	free(str);
 
 	error = ccs_get(cd, CLUSTER_ID_PATH, &str);