diff options
Diffstat (limited to 'lib/utils_base.c')
-rw-r--r-- | lib/utils_base.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/utils_base.c b/lib/utils_base.c index 3dae32fb..18fb3f25 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c | |||
@@ -96,12 +96,12 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st | |||
96 | 96 | ||
97 | if (warn_string != NULL) { | 97 | if (warn_string != NULL) { |
98 | if ((temp_thresholds->warning = parse_range_string(warn_string)) == NULL) { | 98 | if ((temp_thresholds->warning = parse_range_string(warn_string)) == NULL) { |
99 | return 1; | 99 | return NP_RANGE_UNPARSEABLE; |
100 | } | 100 | } |
101 | } | 101 | } |
102 | if (critical_string != NULL) { | 102 | if (critical_string != NULL) { |
103 | if ((temp_thresholds->critical = parse_range_string(critical_string)) == NULL) { | 103 | if ((temp_thresholds->critical = parse_range_string(critical_string)) == NULL) { |
104 | return 1; | 104 | return NP_RANGE_UNPARSEABLE; |
105 | } | 105 | } |
106 | } | 106 | } |
107 | 107 | ||
@@ -117,10 +117,14 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st | |||
117 | void | 117 | void |
118 | set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) | 118 | set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) |
119 | { | 119 | { |
120 | if (_set_thresholds(my_thresholds, warn_string, critical_string) == 0) { | 120 | switch (_set_thresholds(my_thresholds, warn_string, critical_string)) { |
121 | case 0: | ||
121 | return; | 122 | return; |
122 | } else { | 123 | case NP_RANGE_UNPARSEABLE: |
123 | die(STATE_UNKNOWN, _("Range format incorrect")); | 124 | die(STATE_UNKNOWN, _("Range format incorrect")); |
125 | case NP_WARN_WITHIN_CRIT: | ||
126 | die(STATE_UNKNOWN, _("Warning level is a subset of critical and will not be alerted")); | ||
127 | break; | ||
124 | } | 128 | } |
125 | } | 129 | } |
126 | 130 | ||