aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--plugins/check_cluster.c4
-rw-r--r--plugins/check_snmp.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 99739a70..7a7ef8c0 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ This file documents the major additions and syntax changes between releases.
and the offset is unavailable, will return UNKNOWN as well.
NOTE: If jitter thresholds are specified integers it will return CRITICAL if jitter
is "-1" as the default range starts at 0. See Examples in --help output.
+ Fix broken usage2 in check_snmp and check_cluster
+ check_cluster now accept all valid characters in its thresholds ("-", "@", "~")
1.4.10 28th September 2007
Fix check_http buffer overflow vulnerability when following HTTP redirects
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 703fff97..f1568d5a 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -178,14 +178,10 @@ int process_arguments(int argc, char **argv){
break;
case 'w': /* warning threshold */
- if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid warning threshold: %s\n"), optarg);
warn_threshold = strdup(optarg);
break;
case 'c': /* warning threshold */
- if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid critical threshold: %s\n"), optarg);
crit_threshold = strdup(optarg);
break;
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 9fa4a60b..c69e97aa 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -521,7 +521,7 @@ process_arguments (int argc, char **argv)
/* Test parameters */
case 'c': /* critical time threshold */
if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid critical threshold: %s\n"), optarg);
+ usage2 (_("Invalid critical threshold"), optarg);
for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
if (llu_getll (&lower_crit_lim[jj], ptr) == 1)
eval_method[jj] |= CRIT_LT;
@@ -532,7 +532,7 @@ process_arguments (int argc, char **argv)
break;
case 'w': /* warning time threshold */
if (strspn (optarg, "0123456789:,") < strlen (optarg))
- usage2 (_("Invalid warning threshold: %s\n"), optarg);
+ usage2 (_("Invalid warning threshold"), optarg);
for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
if (llu_getll (&lower_warn_lim[ii], ptr) == 1)
eval_method[ii] |= WARN_LT;