summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2007-11-11 16:29:05 (GMT)
committerThomas Guyot-Sionnest <dermoth@users.sourceforge.net>2007-11-11 16:29:05 (GMT)
commit1bb5e1e2ff07aaa9dc986807e25cf7243647f72f (patch)
tree89a4fc77ad7e8196049fd0f2589d50e7c02ce2ef
parentb24243c2d93511d57ad028b25389795a0094291a (diff)
downloadmonitoring-plugins-1bb5e1e2ff07aaa9dc986807e25cf7243647f72f.tar.gz
Fix broken usage2 in check_snmp and check_cluster
Fix check_cluster blocking some special characters for thresholds ("-", "@", "~") git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1827 f882894a-f735-0410-b71e-b25c423dba1c
-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 99739a7..7a7ef8c 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,8 @@ This file documents the major additions and syntax changes between releases.
9 and the offset is unavailable, will return UNKNOWN as well. 9 and the offset is unavailable, will return UNKNOWN as well.
10 NOTE: If jitter thresholds are specified integers it will return CRITICAL if jitter 10 NOTE: If jitter thresholds are specified integers it will return CRITICAL if jitter
11 is "-1" as the default range starts at 0. See Examples in --help output. 11 is "-1" as the default range starts at 0. See Examples in --help output.
12 Fix broken usage2 in check_snmp and check_cluster
13 check_cluster now accept all valid characters in its thresholds ("-", "@", "~")
12 14
131.4.10 28th September 2007 151.4.10 28th September 2007
14 Fix check_http buffer overflow vulnerability when following HTTP redirects 16 Fix check_http buffer overflow vulnerability when following HTTP redirects
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 703fff9..f1568d5 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -178,14 +178,10 @@ int process_arguments(int argc, char **argv){
178 break; 178 break;
179 179
180 case 'w': /* warning threshold */ 180 case 'w': /* warning threshold */
181 if (strspn (optarg, "0123456789:,") < strlen (optarg))
182 usage2 (_("Invalid warning threshold: %s\n"), optarg);
183 warn_threshold = strdup(optarg); 181 warn_threshold = strdup(optarg);
184 break; 182 break;
185 183
186 case 'c': /* warning threshold */ 184 case 'c': /* warning threshold */
187 if (strspn (optarg, "0123456789:,") < strlen (optarg))
188 usage2 (_("Invalid critical threshold: %s\n"), optarg);
189 crit_threshold = strdup(optarg); 185 crit_threshold = strdup(optarg);
190 break; 186 break;
191 187
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 9fa4a60..c69e97a 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -521,7 +521,7 @@ process_arguments (int argc, char **argv)
521 /* Test parameters */ 521 /* Test parameters */
522 case 'c': /* critical time threshold */ 522 case 'c': /* critical time threshold */
523 if (strspn (optarg, "0123456789:,") < strlen (optarg)) 523 if (strspn (optarg, "0123456789:,") < strlen (optarg))
524 usage2 (_("Invalid critical threshold: %s\n"), optarg); 524 usage2 (_("Invalid critical threshold"), optarg);
525 for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) { 525 for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) {
526 if (llu_getll (&lower_crit_lim[jj], ptr) == 1) 526 if (llu_getll (&lower_crit_lim[jj], ptr) == 1)
527 eval_method[jj] |= CRIT_LT; 527 eval_method[jj] |= CRIT_LT;
@@ -532,7 +532,7 @@ process_arguments (int argc, char **argv)
532 break; 532 break;
533 case 'w': /* warning time threshold */ 533 case 'w': /* warning time threshold */
534 if (strspn (optarg, "0123456789:,") < strlen (optarg)) 534 if (strspn (optarg, "0123456789:,") < strlen (optarg))
535 usage2 (_("Invalid warning threshold: %s\n"), optarg); 535 usage2 (_("Invalid warning threshold"), optarg);
536 for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) { 536 for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) {
537 if (llu_getll (&lower_warn_lim[ii], ptr) == 1) 537 if (llu_getll (&lower_warn_lim[ii], ptr) == 1)
538 eval_method[ii] |= WARN_LT; 538 eval_method[ii] |= WARN_LT;