From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 7 Oct 2015 13:09:55 +0000 (-0700)
Subject: Add missing keywords in ConfigCompiler::GetKeywords
X-Git-Tag: v2.4.0~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9eb7cfa620822d457dc0d3c0462aa7d7478b5e4c;p=icinga2

Add missing keywords in ConfigCompiler::GetKeywords

refs #9960
---

diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 075dfa932..7827a183d 100644
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -169,7 +169,7 @@ object				return T_OBJECT;
 template			return T_TEMPLATE;
 include				return T_INCLUDE;
 include_recursive		return T_INCLUDE_RECURSIVE;
-include_zones		return T_INCLUDE_ZONES;
+include_zones			return T_INCLUDE_ZONES;
 library				return T_LIBRARY;
 null				return T_NULL;
 true				{ yylval->boolean = 1; return T_BOOLEAN; }
diff --git a/lib/config/configcompiler.cpp b/lib/config/configcompiler.cpp
index de91cb883..412801a87 100644
--- a/lib/config/configcompiler.cpp
+++ b/lib/config/configcompiler.cpp
@@ -323,6 +323,7 @@ const std::vector<String>& ConfigCompiler::GetKeywords(void)
 		keywords.push_back("template");
 		keywords.push_back("include");
 		keywords.push_back("include_recursive");
+		keywords.push_back("include_zones");
 		keywords.push_back("library");
 		keywords.push_back("null");
 		keywords.push_back("true");
@@ -333,6 +334,7 @@ const std::vector<String>& ConfigCompiler::GetKeywords(void)
 		keywords.push_back("globals");
 		keywords.push_back("locals");
 		keywords.push_back("use");
+		keywords.push_back("ignore_on_error");
 		keywords.push_back("apply");
 		keywords.push_back("to");
 		keywords.push_back("where");