--- projects/cms/source/ihost/libstatgrab/user_stats.c	2002/05/18 18:15:56	1.3
+++ projects/cms/source/ihost/libstatgrab/user_stats.c	2002/05/21 16:47:12	1.7
@@ -1,5 +1,6 @@
 /* 
  * i-scream central monitoring system
+ * http://www.i-scream.org.uk
  * Copyright (C) 2000-2002 i-scream
  * 
  * This program is free software; you can redistribute it and/or
@@ -40,6 +41,7 @@ char *get_user_stats(){
 #endif
 
 #if defined(LINUX) || defined(SOLARIS)
+	setutent();
 	while((entry=getutent()) != NULL) {
 		if(entry->ut_type==USER_PROCESS) {
 			user_tmp=user_list;
@@ -52,6 +54,7 @@ char *get_user_stats(){
 			nousers++;
 		}
 	}
+	endutent();
 #endif
 
 #ifdef FREEBSD
@@ -71,9 +74,23 @@ char *get_user_stats(){
 		if(user_tmp!=NULL) free(user_tmp);
 		nousers++;
 	}
+
+        if ((fclose(f)) != 0) {
+                errf("Failed to close file (%m)");
+                return NULL;
+        }
+
 #endif
-	if (user_list==NULL) user_list=strdup("");
-	xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers);
+	if (user_list==NULL){
+		if((user_list=strdup("")) == NULL){
+			errf("strdup failed (%m)");
+			return NULL;
+		}
+	}
+	if((xml_user_data=strf("<users><list>%s</list><count>%d</count></users>",user_list,nousers)) == NULL){
+		errf("strf failed (%m)");
+		return NULL;
+	}
 	if (user_list!=NULL) free(user_list);
 	return xml_user_data;
 }