Livestatus: Fix 'OutputFormat:json' w/o space is valid (NagVis bug)

Fixes #6470

diff --git a/components/livestatus/livestatusquery.cpp b/components/livestatus/livestatusquery.cpp
index 134b418e22cf0d13ea88215d3ea463738fc51c5e..698163a25296b53861191c7de71536c344767eb7 100644 (file)
--- a/components/livestatus/livestatusquery.cpp
+++ b/components/livestatus/livestatusquery.cpp
@@ -106,8 +106,11 @@ LivestatusQuery::LivestatusQuery(const std::vector<String>& lines, const String&
                String header = line.SubStr(0, col_index);
                String params;
 
-               if (line.GetLength() > col_index + 2)
-                       params = line.SubStr(col_index + 2);
+               //OutputFormat:json or OutputFormat: json
+               if (line.GetLength() > col_index + 1)
+                       params = line.SubStr(col_index + 1);
+
+               params.Trim();
 
                if (header == "ResponseHeader")
                        m_ResponseHeader = params;

diff --git a/test/livestatus/queries/host/host_nagvis b/test/livestatus/queries/host/host_nagvis
new file mode 100644 (file)
index 0000000..34cdc75
--- /dev/null
+++ b/test/livestatus/queries/host/host_nagvis
@@ -0,0 +1,6 @@
+GET hosts
+Columns: name alias
+OutputFormat:json
+KeepAlive: on
+ResponseHeader: fixed16
+