diff options
| author |  Thomas Guyot-Sionnest <dermoth@users.sourceforge.net>
| 2007-05-29 05:22:32 +0000 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@users.sourceforge.net>
| 2007-05-29 05:22:32 +0000 |
| commit | 063d2541ef07e07a49ad7728c2c6b0154af7123f (patch) | |
| tree | a48ab93b4759002070b241fb8a36020f952caf74 | |
| parent | 757e1676f1cea81fdb2852febb6f312ea6a67bd3 (diff) | |
| download | monitoring-plugins-063d2541ef07e07a49ad7728c2c6b0154af7123f.tar.gz | |
check_snmp don't warn anymore if something is printed on stderr
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1721 f882894a-f735-0410-b71e-b25c423dba1c
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | plugins/check_snmp.c | 11 |
2 files changed, 10 insertions, 2 deletions
@@ -8,6 +8,7 @@ This file documents the major additions and syntax changes between releases. check_load can optionally divide by number of cpus Fix check_time returning wrong OK when time is before the epoch on some arch Make check_http output more consistent + check_snmp don't warn anymore if something is printed on stderr 1.4.8 11th April 2007 Respects --without-world-permissions for setuid plugins diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index f8bba99e..fd3028cf 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -204,10 +204,12 @@ main (int argc, char **argv) exit (STATE_UNKNOWN); } +#if 0 /* Removed May 29, 2007 */ child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r"); if (child_stderr == NULL) { printf (_("Could not open stderr for %s\n"), command_line); } +#endif while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) asprintf (&output, "%s%s", output, input_buffer); @@ -369,16 +371,21 @@ main (int argc, char **argv) label, command_line); +#if 0 /* Removed May 29, 2007 */ /* WARNING if output found on stderr */ if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) result = max_state (result, STATE_WARNING); /* close stderr */ (void) fclose (child_stderr); +#endif /* close the pipe */ - if (spclose (child_process)) - result = max_state (result, STATE_WARNING); + if (spclose (child_process)) { + if (result == STATE_OK) + result = STATE_UNKNOWN; + asprintf (&outbuff, "%s (%s)", outbuff, _("snmpget returned an error status")); + } /* if (nunits == 1 || i == 1) */ /* printf ("%s %s -%s %s\n", label, state_text (result), outbuff, units); */ |