diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2008-02-28 16:21:59 +0000 |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2008-02-28 16:21:59 +0000 |
commit | 9f3d864fd3e47d4e728b196b1b6948a8a5e47e4e (patch) | |
tree | ffaf70a0a09e40cf706f1362a01450f76e845d18 /plugins-root | |
parent | f00e6a9676154eaac8aed140c49bde76e52d6cee (diff) | |
download | monitoring-plugins-9f3d864fd3e47d4e728b196b1b6948a8a5e47e4e.tar.gz |
Reverted check_procs for solaris back to using pst3 due to truncation
for argument fields using other methods
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1937 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins-root')
-rw-r--r-- | plugins-root/Makefile.am | 3 | ||||
-rw-r--r-- | plugins-root/pst3.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index e61ebc75..3e6ee43d 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am | |||
@@ -7,7 +7,7 @@ INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$( | |||
7 | datadir = @datadir@ | 7 | datadir = @datadir@ |
8 | localedir = $(datadir)/locale | 8 | localedir = $(datadir)/locale |
9 | DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ | 9 | DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ |
10 | LIBS = @LIBINTL@ @LIBS@ @SSLLIBS@ | 10 | LIBS = @LIBINTL@ @LIBS@ |
11 | 11 | ||
12 | noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@ | 12 | noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@ |
13 | 13 | ||
@@ -68,6 +68,7 @@ install-exec-local: $(noinst_PROGRAMS) | |||
68 | # the actual targets | 68 | # the actual targets |
69 | check_dhcp_LDADD = $(NETLIBS) | 69 | check_dhcp_LDADD = $(NETLIBS) |
70 | check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) | 70 | check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) |
71 | pst3_CFLAGS = @PST3CFLAGS@ | ||
71 | pst3_LDADD = -lkvm | 72 | pst3_LDADD = -lkvm |
72 | 73 | ||
73 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) | 74 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) |
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c index bf4b40d3..87340062 100644 --- a/plugins-root/pst3.c +++ b/plugins-root/pst3.c | |||
@@ -187,9 +187,10 @@ static int HandlePsInfo (char *szPath, psinfo_t *pPsInfo) | |||
187 | thisProg = myArgv[0]; | 187 | thisProg = myArgv[0]; |
188 | 188 | ||
189 | /* Display the ps columns (except for argv) */ | 189 | /* Display the ps columns (except for argv) */ |
190 | printf("%c %5d %5d %6lu %6lu %4.1f %s ", | 190 | printf("%c %5d %5d %5d %6lu %6lu %4.1f %s ", |
191 | pPsInfo->pr_lwp.pr_sname, | 191 | pPsInfo->pr_lwp.pr_sname, |
192 | (int)(pPsInfo->pr_euid), | 192 | (int)(pPsInfo->pr_euid), |
193 | (int)(pPsInfo->pr_pid), | ||
193 | (int)(pPsInfo->pr_ppid), | 194 | (int)(pPsInfo->pr_ppid), |
194 | (unsigned long)(pPsInfo->pr_size), | 195 | (unsigned long)(pPsInfo->pr_size), |
195 | (unsigned long)(pPsInfo->pr_rssize), | 196 | (unsigned long)(pPsInfo->pr_rssize), |