Merge branch 'master' into dev/check_ssh-patches

2 files changed, 12 insertions, 10 deletions

diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 088a445..7879791 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -16,13 +16,13 @@ VPATH=$(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/
 libexec_SCRIPTS = check_breeze check_disk_smb check_flexlm check_ircd \
         check_log check_oracle check_rpc check_sensors check_wave \
         check_ifstatus check_ifoperstatus check_mailq check_file_age \
-        check_uptime \
+        check_uptime check_mssql \
         utils.sh utils.pm
 
 EXTRA_DIST=check_breeze.pl check_disk_smb.pl check_flexlm.pl check_ircd.pl \
         check_log.sh check_oracle.sh check_rpc.pl check_sensors.sh \
         check_ifstatus.pl check_ifoperstatus.pl check_wave.pl check_mailq.pl check_file_age.pl \
-        check_uptime.pl \
+        check_uptime.pl check_mssql.pl \
         utils.sh.in utils.pm.in t
 
 EDIT = sed \
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index d3968a2..aefda3d 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -46,6 +46,7 @@ const char *email = "devel@monitoring-plugins.org";
 #define DEFAULT_PRIV_PROTOCOL "DES"
 #define DEFAULT_DELIMITER "="
 #define DEFAULT_OUTPUT_DELIMITER " "
+#define DEFAULT_BUFFER_SIZE 100
 
 #define mark(a) ((a)!=0?"*":"")
 
@@ -157,6 +158,7 @@ int perf_labels = 1;
 char* ip_version = "";
 double multiplier = 1.0;
 char *fmtstr = "";
+char buffer[DEFAULT_BUFFER_SIZE];
 
 static char *fix_snmp_range(char *th)
 {
@@ -1169,15 +1171,15 @@ multiply (char *str)
         double val;
         char *conv = "%f";
 
+        if(multiplier == 1)
+                return(str);
+
         if(verbose>2)
                 printf("    multiply input: %s\n", str);
 
         val = strtod (str, &endptr);
         if ((val == 0.0) && (endptr == str)) {
-                if(multiplier != 1) {
-                        die(STATE_UNKNOWN, _("multiplier set (%.1f), but input is not a number: %s"), multiplier, str);
-                }
-                return str;
+                die(STATE_UNKNOWN, _("multiplier set (%.1f), but input is not a number: %s"), multiplier, str);
         }
 
         if(verbose>2)
@@ -1187,15 +1189,15 @@ multiply (char *str)
                 conv = fmtstr;
         }
         if (val == (int)val) {
-                sprintf(str, "%.0f", val);
+                snprintf(buffer, DEFAULT_BUFFER_SIZE, "%.0f", val);
         } else {
                 if(verbose>2)
                         printf("    multiply using format: %s\n", conv);
-                sprintf(str, conv, val);
+                snprintf(buffer, DEFAULT_BUFFER_SIZE, conv, val);
         }
         if(verbose>2)
-                printf("    multiply result: %s\n", str);
-        return str;
+                printf("    multiply result: %s\n", buffer);
+        return buffer;
 }