Module: check_mk
Branch: master
Commit: bf20a1f05bb4a79adca15d8d90966fa21100abd2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf20a1f05bb4a7…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jun 9 16:47:53 2016 +0200
Fetched Livestatus from downstream.
---
livestatus/src/Query.cc | 3 +--
livestatus/src/opids.cc | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/livestatus/src/Query.cc b/livestatus/src/Query.cc
index 7314763..402ff48 100644
--- a/livestatus/src/Query.cc
+++ b/livestatus/src/Query.cc
@@ -488,8 +488,7 @@ void Query::parseFilterLine(char *line, AndingFilter &filter) {
return;
}
RelationalOperator relOp;
- ;
- if (relationalOperatorForName(operator_name, relOp)) {
+ if (!relationalOperatorForName(operator_name, relOp)) {
setError(OutputBuffer::ResponseCode::invalid_header,
"invalid filter operator '" + string(operator_name) +
"'");
return;
diff --git a/livestatus/src/opids.cc b/livestatus/src/opids.cc
index 2002c42..ad43801 100644
--- a/livestatus/src/opids.cc
+++ b/livestatus/src/opids.cc
@@ -32,7 +32,7 @@ using std::unordered_map;
namespace {
unordered_map<string, RelationalOperator> fromString = {
- {"==", RelationalOperator::equal},
+ {"=", RelationalOperator::equal},
{"!=", RelationalOperator::not_equal},
{"~", RelationalOperator::matches},
{"!~", RelationalOperator::doesnt_match},