Module: check_mk
Branch: master
Commit: 55efeddd6c849ccefd08e438cd377ecc3befe00e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55efeddd6c849c…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Nov 24 15:27:12 2016 +0100
Fetched livestatus from downstream.
---
livestatus/src/IntFilter.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/livestatus/src/IntFilter.cc b/livestatus/src/IntFilter.cc
index d95dc9a..61bfc7c 100644
--- a/livestatus/src/IntFilter.cc
+++ b/livestatus/src/IntFilter.cc
@@ -57,6 +57,10 @@ bool IntFilter::accepts(void *row, contact *auth_user, int
timezone_offset) {
return (act_value & ref_value) == ref_value;
case RelationalOperator::doesnt_match: // not superset
return (act_value & ref_value) != ref_value;
+ case RelationalOperator::equal_icase: // subset
+ return (act_value & ref_value) == act_value;
+ case RelationalOperator::not_equal_icase: // not subset
+ return (act_value & ref_value) != act_value;
case RelationalOperator::matches_icase: // contains any
return (act_value & ref_value) != 0;
case RelationalOperator::doesnt_match_icase: // contains none of
@@ -69,11 +73,6 @@ bool IntFilter::accepts(void *row, contact *auth_user, int
timezone_offset) {
return act_value > ref_value;
case RelationalOperator::less_or_equal:
return act_value <= ref_value;
- case RelationalOperator::equal_icase:
- case RelationalOperator::not_equal_icase:
- Informational(logger()) << "Sorry. Operator " <<
_relOp
- << " for integer columns not
implemented.";
- return false;
}
return false; // unreachable
}