--- projects/cms/source/ihost/ihost.c	2003/03/08 20:41:46	1.33
+++ projects/cms/source/ihost/ihost.c	2003/03/10 08:18:17	1.36
@@ -77,8 +77,8 @@ ihost_config_t ihost_config;
 
 extern int errno;
 
-/* Taken from the openssh code. Its licence included in function.*/
-//#ifndef HAVE_STRLCAT
+/* Taken from the OpenSSH code. Its licence included in function.*/
+#ifndef HAVE_STRLCAT
 
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -106,6 +106,7 @@ extern int errno;
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
  * full size of dst, not space left).  At most siz-1 characters
@@ -144,9 +145,9 @@ strlcat(dst, src, siz)
         return(dlen + (s - src));       /* count does not include NUL */
 }
 
-//#endif
+#endif
+/* End strlcat function taken from OpenSSH */
 
-
 void log_msg(int level, char *format, ...){
 	int cur_errno;
 	va_list ap;
@@ -292,7 +293,7 @@ int ihost_getconfig(ihost_state_t *ihost_state){
 	time_t config_ttl=0;
 
 	if((tcp_con=create_tcp_connection(ihost_state->filtermanager_host, ihost_state->filtermanager_port))==NULL){
-		goto error;
+		return -1;
 	}
 
 	if(ihost_state->file_list!=NULL || ihost_state->last_modified!=NULL){
@@ -577,7 +578,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 			y=page_stats->pages_pageout;
 		}
 		snprintf(tmp, size, \
-			"<pages><swapins>%lld</swapins><swapouts>%lld</swapouts></pages>", \
+			"<pages><pageins>%lld</pageins><pageouts>%lld</pageouts></pages>", \
 			x, \
 			y);