You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
114 lines
3.3 KiB
114 lines
3.3 KiB
Index: autoconf/Makefile.in |
|
--- autoconf/Makefile.in.orig 2003-11-06 04:41:31 +0100 |
|
+++ autoconf/Makefile.in 2007-12-09 19:01:16 +0100 |
|
@@ -11,7 +11,7 @@ |
|
CC = @CC@ |
|
LEX = @LEX@ |
|
CFILE = @sysconfdir@/sysmon.conf |
|
-INCLUDES = -I/usr/local/include |
|
+INCLUDES = @CPPFLAGS@ |
|
CFLAGS = @CFLAGS@ '@SENDMAIL@' -DCFILE='"$(CFILE)"' @SNP@ $(INCLUDES) |
|
#@IPV6@ |
|
|
|
Index: configure |
|
--- configure.orig 2005-09-21 03:23:51 +0200 |
|
+++ configure 2007-12-09 19:01:16 +0100 |
|
@@ -1390,14 +1390,6 @@ |
|
fi; |
|
|
|
|
|
- if test "x/usr/local/" != x -a -d /usr/local/; then |
|
- if test -d /usr/local//lib; then |
|
- LDFLAGS="-L/usr/local//lib $LDFLAGS" |
|
- fi |
|
- if test -d /usr/local//include; then |
|
- CPPFLAGS="-I/usr/local//include $CPPFLAGS" |
|
- fi |
|
- fi |
|
|
|
|
|
ac_ext=c |
|
@@ -4475,14 +4467,6 @@ |
|
|
|
|
|
|
|
- if test "x/usr/local/ssl" != x -a -d /usr/local/ssl; then |
|
- if test -d /usr/local/ssl/lib; then |
|
- LDFLAGS="-L/usr/local/ssl/lib $LDFLAGS" |
|
- fi |
|
- if test -d /usr/local/ssl/include; then |
|
- CPPFLAGS="-I/usr/local/ssl/include $CPPFLAGS" |
|
- fi |
|
- fi |
|
|
|
echo "$as_me:$LINENO: checking for main in -lssl" >&5 |
|
echo $ECHO_N "checking for main in -lssl... $ECHO_C" >&6 |
|
Index: src/config.h |
|
--- src/config.h.orig 2005-10-12 05:30:05 +0200 |
|
+++ src/config.h 2007-12-09 19:01:16 +0100 |
|
@@ -13,7 +13,7 @@ |
|
#include <string.h> |
|
#include <pwd.h> |
|
#include <limits.h> |
|
-#if (defined(__svr4__) || defined(unixware)) /* slo-laris */ |
|
+#if defined(__svr4__) || defined(unixware) || (defined(__sun) && defined(__SVR4)) /* slo-laris */ |
|
#include <sys/filio.h> |
|
#endif |
|
#include <sys/types.h> |
|
@@ -72,11 +72,7 @@ |
|
#endif /* HAVE_LIBNCURSES */ |
|
|
|
#ifdef NICEINTERFACE |
|
-#ifdef sgi |
|
-#include "/usr/local/include/ncurses.h" |
|
-#else |
|
#include <curses.h> |
|
-#endif /* sgi */ |
|
#endif /* NICEINTERFACE */ |
|
|
|
#ifdef HAVE_NET_SNMP_VERSION_H |
|
Index: src/http.c |
|
--- src/http.c.orig 2003-12-16 18:33:44 +0100 |
|
+++ src/http.c 2007-12-09 19:01:28 +0100 |
|
@@ -174,7 +174,7 @@ |
|
memset(buffer, 0, 1024); |
|
snprintf(buffer, 1024, "GET %s HTTP/1.0", here->checkent->url); |
|
sendline(here->filedes, buffer); |
|
- sendline(here->filedes, "User-Agent: sysmond/http.c"); |
|
+ sendline(here->filedes, "User-Agent: SysMon"); |
|
memset(buffer, 0, 1024); |
|
snprintf(buffer, 1024, "Host: %s", here->checkent->hostname); |
|
sendline(here->filedes, buffer); |
|
Index: src/page.c |
|
--- src/page.c.orig 2003-12-16 18:33:44 +0100 |
|
+++ src/page.c 2007-12-09 19:01:16 +0100 |
|
@@ -102,17 +102,17 @@ |
|
memcpy(out,tmp,1024); |
|
break; |
|
case 'c': |
|
- snprintf(tmp, 1024, "%s %ld", out, |
|
+ snprintf(tmp, 1024, "%s%ld", out, |
|
svc->downct); |
|
memcpy(out,tmp,1024); |
|
break; |
|
case 'C': |
|
- snprintf(tmp, 1024, "%s %ld", out, |
|
+ snprintf(tmp, 1024, "%s%ld", out, |
|
svc->upct); |
|
memcpy(out,tmp,1024); |
|
break; |
|
case 'p': |
|
- snprintf(tmp, 1024, "%s %d", out, |
|
+ snprintf(tmp, 1024, "%s%d", out, |
|
svc->port); |
|
memcpy(out,tmp,1024); |
|
break; |
|
@@ -122,7 +122,7 @@ |
|
value = (100.0000-((tmp1/tmp2) * 100)); |
|
if (value<0) value=0.000; |
|
if (tmp2==0) value=100.00; |
|
- snprintf(tmp, 1024, "%s %10.6f%%", out, |
|
+ snprintf(tmp, 1024, "%s%.1f%%", out, |
|
value); |
|
memcpy(out,tmp,1024); |
|
break;
|
|
|