From 8cb513796c339997eb02a8bb21198abcfb683b51 Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Thu, 7 Aug 2014 22:31:00 -0700
Subject: [PATCH 1/2] Patched noenv

---
 xymonproxy/xymonproxy.c | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/xymonproxy/xymonproxy.c b/xymonproxy/xymonproxy.c
index 88f65eb..f526ee5 100644
--- a/xymonproxy/xymonproxy.c
+++ b/xymonproxy/xymonproxy.c
@@ -320,23 +320,8 @@ int main(int argc, char *argv[])
 		}
 		else if (argnmatch(argv[opt], "--report=")) {
 			char *p1 = strchr(argv[opt], '=')+1;
-
-			if (strchr(p1, '.') == NULL) {
-				if (xgetenv("MACHINE") == NULL) {
-					errprintf("Environment variable MACHINE is undefined\n");
-					return 1;
-				}
-
-				proxyname = strdup(xgetenv("MACHINE"));
-				proxyname = (char *)realloc(proxyname, strlen(proxyname) + strlen(p1) + 1);
-				strcat(proxyname, ".");
-				strcat(proxyname, p1);
-				proxynamesvc = strdup(p1);
-			}
-			else {
-				proxyname = strdup(p1);
-				proxynamesvc = strchr(proxyname, '.')+1;
-			}
+			proxyname = strdup(p1);
+			proxynamesvc = strchr(proxyname, '.')+1;
 		}
 		else if (strcmp(argv[opt], "--debug") == 0) {
 			debug = 1;
-- 
1.8.4.5


From f915d0243e5c5a01d9b706a72c306b26ccf7cf3a Mon Sep 17 00:00:00 2001
From: William Murphy <warrendiogenese@gmail.com>
Date: Thu, 7 Aug 2014 22:31:00 -0700
Subject: [PATCH 2/2] Patched clienttimeout

---
 common/xymon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xymon.c b/common/xymon.c
index a3f88ab..c921407 100644
--- a/common/xymon.c
+++ b/common/xymon.c
@@ -27,7 +27,7 @@ static char rcsid[] = "$Id: xymon.c 7223 2013-07-25 19:56:20Z storner $";
 
 int main(int argc, char *argv[])
 {
-	int timeout = XYMON_TIMEOUT;
+	int timeout = (getenv("XYMON_TIMEOUT") != NULL) ? atoi(xgetenv("XYMON_TIMEOUT")) : XYMON_TIMEOUT;
 	int result = 1;
 	int argi;
 	int showhelp = 0;
-- 
1.8.4.5