summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2010-03-31 02:31:20 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2010-03-31 02:31:20 (GMT)
commit120985853e71d6f20d598d1968f0df9db5163957 (patch)
tree32a7d29fd68cea965b1df25ae261d6a204ff169a /plugins
parent08d8d119411fc875de56fac645b17152425eee46 (diff)
downloadmonitoring-plugins-120985853e71d6f20d598d1968f0df9db5163957.tar.gz
check_snmp: Fix regression introduced in #1867716
Bug #1867716 fixed what it meant to fix: broken perfdata strings. Unfortunately some users relied on half-broken perfdata string where at least the first token was OK. This patch do a two-way conversion (string to double then back to string) instead and use the conversion result for the performance data. A possible caveat is that the string may change where it normally shouldn't but the result should be somewhat similar.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_snmp.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index dcb3138..ce3919d 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -122,6 +122,7 @@ main (int argc, char **argv)
122 int result = STATE_UNKNOWN; 122 int result = STATE_UNKNOWN;
123 int return_code = 0; 123 int return_code = 0;
124 int external_error = 0; 124 int external_error = 0;
125 double perftmp;
125 char **command_line = NULL; 126 char **command_line = NULL;
126 char *cl_hidden_auth = NULL; 127 char *cl_hidden_auth = NULL;
127 char *oidname = NULL; 128 char *oidname = NULL;
@@ -351,10 +352,17 @@ main (int argc, char **argv)
351 if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL) 352 if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
352 asprintf (&outbuff, "%s %s", outbuff, unitv[i]); 353 asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
353 354
354 if (is_numeric(show)) { 355 /* Try a two-way conversion of show and add perfdata only if we get
356 * something back at the end */
357 ptr = NULL;
358 perftmp = strtod(show, &ptr);
359 if (ptr != show) {
360 ptr = NULL;
361 asprintf(&ptr, "%0.9g", perftmp);
355 strncat(perfstr, oidname, sizeof(perfstr)-strlen(perfstr)-1); 362 strncat(perfstr, oidname, sizeof(perfstr)-strlen(perfstr)-1);
356 strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1); 363 strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
357 strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1); 364 strncat(perfstr, ptr, sizeof(perfstr)-strlen(perfstr)-1);
365 free(ptr);
358 366
359 if (type) 367 if (type)
360 strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1); 368 strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);