[Cluster-devel] cluster/rgmanager ChangeLog src/utils/clustat.c

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2006-09-27 16:32:13

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/utils: clustat.c 

Log message:
	Apply patch from Fabio M. Di Nitto to fix clustat service name expansion bug

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.25&r2=1.26
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&r1=1.21&r2=1.22

--- cluster/rgmanager/ChangeLog	2006/09/27 16:28:41	1.25
+++ cluster/rgmanager/ChangeLog	2006/09/27 16:32:13	1.26
@@ -23,7 +23,8 @@
 	decide if we need to wait for a node to be fenced or not.  Fix
 	node ID type.
 	* src/utils/clustat.c: Fix logic error preventing nodes from properly
-	being flagged.
+	being flagged.  Apply patch from Fabio M. Di Nitto to fix bug where
+	clustat -s foo wasn't getting expanded to service:foo
 
 2006-09-01 Lon Hohberger <lhh at redhat.com>
 	* include/resgroup.h: Add proto for rg_strerror
--- cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:28:41	1.21
+++ cluster/rgmanager/src/utils/clustat.c	2006/09/27 16:32:13	1.22
@@ -683,7 +683,7 @@
 	int refresh_sec = 0, errors = 0;
 	int opt, xml = 0, flags = 0;
 	char *member_name = NULL;
-	char *rg_name = NULL;
+	char *rg_name = NULL, real_rg_name[64];
 
 	while ((opt = getopt(argc, argv, "fIls:m:i:xvQh?")) != EOF) {
 		switch(opt) {
@@ -715,6 +715,9 @@
 
 		case 's':
 			rg_name = optarg;
+			if (!strchr(rg_name,':')) {
+				snprintf(real_rg_name, , sizeof(real_rg_name), "service:%s", rg_name);
+				rg_name = real_rg_name;
 			break;
 
 		case 'x':