check_snmp: Fix regression introduced in #1867716

[nagiosplug.git] / plugins / check_snmp.c

diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index dcb31386478e9b191ed8864c8681362fdde0a6ed..ce3919d1af4f3592f08b3fa229cffe1102ce4bc5 100644 (file)
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -122,6 +122,7 @@ main (int argc, char **argv)
        int result = STATE_UNKNOWN;
        int return_code = 0;
        int external_error = 0;
+       double perftmp;
        char **command_line = NULL;
        char *cl_hidden_auth = NULL;
        char *oidname = NULL;
@@ -351,10 +352,17 @@ main (int argc, char **argv)
                if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
                        asprintf (&outbuff, "%s %s", outbuff, unitv[i]);
 
-               if (is_numeric(show)) {
+               /* Try a two-way conversion of show and add perfdata only if we get
+                * something back at the end */
+               ptr = NULL;
+               perftmp = strtod(show, &ptr);
+               if (ptr != show) {
+                       ptr = NULL;
+                       asprintf(&ptr, "%0.9g", perftmp);
                        strncat(perfstr, oidname, sizeof(perfstr)-strlen(perfstr)-1);
                        strncat(perfstr, "=", sizeof(perfstr)-strlen(perfstr)-1);
-                       strncat(perfstr, show, sizeof(perfstr)-strlen(perfstr)-1);
+                       strncat(perfstr, ptr, sizeof(perfstr)-strlen(perfstr)-1);
+                       free(ptr);
 
                        if (type)
                                strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);