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

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	lhh at sourceware.org	2007-01-17 16:19:07

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

Log message:
	Fix #222961 - required for Conga to work.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/clustat.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.25.4.1&r2=1.25.4.2

--- cluster/rgmanager/src/utils/clustat.c	2006/12/13 18:39:20	1.25.4.1
+++ cluster/rgmanager/src/utils/clustat.c	2007/01/17 16:19:07	1.25.4.2
@@ -531,7 +531,7 @@
 
 int
 xml_rg_states(rg_state_list_t *rgl, cluster_member_list_t *members,
-	      char *svcname)
+	      char *svcname, int flags)
 {
 	int x;
 	int ret = 0;
@@ -545,6 +545,7 @@
 		if (svcname &&
 		    strcmp(rgl->rgl_states[x].rs_name, svcname))
 			continue;
+		xml_rg_state(&rgl->rgl_states[x], members, flags);
 		if (svcname) {
 			switch (rgl->rgl_states[x].rs_state) {
 			case RG_STATE_STARTING:
@@ -742,7 +743,7 @@
  	
   	if (rgs &&
   	    (!name || (name && svcname)))
- 		ret2 = xml_rg_states(rgs, membership, svcname);
+ 		ret2 = xml_rg_states(rgs, membership, svcname, flags);
   	printf("</clustat>\n");
  	
  	if (name && ret1)