View | Details | Raw Unified | Return to bug 58776
Collapse All | Expand All

(-)nagios-plugins/files/patch-check_dns.c (+11 lines)
Line 0 Link Here
1 
--- plugins/check_dns.c.orig	Fri Oct 31 16:01:52 2003
2 
+++ plugins/check_dns.c	Fri Oct 31 16:02:21 2003
3 
@@ -88,7 +88,7 @@
4 
 	}
5
6 
 	/* get the command to run */
7 
-	asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND,	query_address, dns_server);
8 
+	asprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND,	query_address, "-",dns_server);
9
10 
 	alarm (timeout_interval);
11 
 	time (&start_time);
(-)nagios-plugins/files/patch-configure.in (-1 / +36 lines)
Lines 1-5 Link Here
1 
--- configure.in.orig	Fri Jul 11 08:12:23 2003
 1 
--- configure.in.orig	Fri Jul 11 08:12:23 2003
2 
+++ configure.in	Sun Jul 13 13:13:37 2003
 2 
+++ configure.in	Fri Oct 31 16:57:06 2003
3 
@@ -12,7 +12,7 @@
 3 
@@ -12,7 +12,7 @@
4 
 AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
 4 
 AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})
5 
 AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
 5 
 AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)
Lines 79-84 Link Here
79 
 LIBS="$_SAVEDLIBS"
 79 
 LIBS="$_SAVEDLIBS"
80
80
81 
 dnl Check for OpenSSL location
 81 
 dnl Check for OpenSSL location
82 
@@ -418,7 +429,7 @@
83 
 fi
84
85 
 AC_PATH_PROG(PATH_TO_PS,ps)
86 
-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
87 
+dnl For OpenBSD 3.2 & 3.3. Must come before ps -axweo
88 
 dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
89 
 if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
90 
 then
91 
@@ -434,19 +445,19 @@
92 
 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
93 
   echo "      ps syntax... $PATH_TO_PS -axwo 'stat uid ppid comm args'"
94 
 dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
95 
-elif ps -weo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
96 
+elif ps -axweo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
97 
 then
98 
 	AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
99 
 	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
100 
-	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -weo 'stat user ppid args'",[Verbatim command to execute for ps in check_netsaint])
101 
+	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axweo 'stat user ppid args'",[Verbatim command to execute for ps in check_netsaint])
102 
 	EXTRAS="$EXTRAS check_nagios"
103 
-	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -weo 'stat uid ppid comm args'",[Verbatim command to execute for ps in check_procs])
104 
+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axweo 'stat uid ppid comm args'",[Verbatim command to execute for ps in check_procs])
105 
 	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
106 
-	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -weo 'vsz comm'",[Verbatim command to execute for ps in check_vsz])
107 
+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axweo 'vsz comm'",[Verbatim command to execute for ps in check_vsz])
108 
 	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
109 
-	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -weo 'rss comm'",[Verbatim command to execute for ps in check_rss])
110 
+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axweo 'rss comm'",[Verbatim command to execute for ps in check_rss])
111 
 	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
112 
-  echo "      ps syntax... $PATH_TO_PS -weo 'stat comm vsz rss user ppid args'"
113 
+  echo "      ps syntax... $PATH_TO_PS -axweo 'stat comm vsz rss user ppid args'"
114 
 dnl FreeBSD
115 
 elif ps waxco 'state command vsz rss uid user ppid' 2>/dev/null | egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
116 
 then
82 
@@ -841,6 +852,8 @@
 117 
@@ -841,6 +852,8 @@
83 
 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
 118 
 	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])
84 
 fi
 119 
 fi

Return to bug 58776