summaryrefslogtreecommitdiffstats
path: root/plugins/check_snmp.c
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2010-12-01 03:48:43 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2010-12-01 03:48:43 (GMT)
commit5a2814a21bff07b87a7589ef19b63c9eecb8be9f (patch)
treee112f9645005cb6fb84b96c11640dd613fe14e0c /plugins/check_snmp.c
parent811684ffe394d050158c2a98d5be211d5ded3c88 (diff)
downloadmonitoring-plugins-5a2814a21bff07b87a7589ef19b63c9eecb8be9f.tar.gz
Revert "check_snmp now considers strings returned by SNMP that contain just"
This reverts commit 896962a1ad1b7d7c75d42c565b06cc799feb0a7c. Conflicts: NEWS plugins/tests/check_snmp.t Notes: Reverting because I rebased a patch that was doing the same thing, plus fixing more related regressions, and both didn't work together. I kept the tests intact except for one that wouldn't pass on 1.4.14 either
Diffstat (limited to 'plugins/check_snmp.c')
-rw-r--r--plugins/check_snmp.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index cb7fb7a..d79da8c 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -160,7 +160,6 @@ main (int argc, char **argv)
160 char *outbuff; 160 char *outbuff;
161 char *ptr = NULL; 161 char *ptr = NULL;
162 char *show = NULL; 162 char *show = NULL;
163 char *endptr = NULL;
164 char *th_warn=NULL; 163 char *th_warn=NULL;
165 char *th_crit=NULL; 164 char *th_crit=NULL;
166 char type[8] = ""; 165 char type[8] = "";
@@ -390,19 +389,6 @@ main (int argc, char **argv)
390 } 389 }
391 } 390 }
392 391
393 /* Allow numeric conversion if whole string is a number. Make concession for strings with " at beginning or end */
394 /* This duplicates the conversion a bit later, but is cleaner to separate out the checking against the conversion */
395 ptr = show;
396 if (*ptr == '"')
397 ptr++;
398 if (*ptr != '\0' ) {
399 strtod( ptr, &endptr );
400 if (*endptr == '"')
401 endptr++;
402 if (*endptr == '\0')
403 is_numeric=1;
404 }
405
406 } 392 }
407 else if (strstr (response, "Timeticks: ")) { 393 else if (strstr (response, "Timeticks: ")) {
408 show = strstr (response, "Timeticks: "); 394 show = strstr (response, "Timeticks: ");