From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 24 Nov 2014 06:18:37 +0000 (+0100)
Subject: Change parameter type for include and include_recursive to T_STRING
X-Git-Tag: v2.3.0~621
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47ba5eeddde44de6242726a286c4c3b1b13cbcfc;p=icinga2

Change parameter type for include and include_recursive to T_STRING

fixes #7802
---

diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index 67c3c4574..92989ef26 100644
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -596,29 +596,26 @@ lterm: T_LOCAL indexer combined_set_op rterm
 		$$ = new SetExpression(MakeIndexer($1), $2, $3, false, DebugInfoRange(@1, @3));
 		free($1);
 	}
-	| T_INCLUDE rterm
+	| T_INCLUDE T_STRING
 	{
-		VMFrame frame;
-		$$ = context->HandleInclude($2->Evaluate(frame), false, DebugInfoRange(@1, @2));
-		delete $2;
+		$$ = context->HandleInclude($2, false, DebugInfoRange(@1, @2));
+		free($2);
 	}
 	| T_INCLUDE T_STRING_ANGLE
 	{
 		$$ = context->HandleInclude($2, true, DebugInfoRange(@1, @2));
 		free($2);
 	}
-	| T_INCLUDE_RECURSIVE rterm
+	| T_INCLUDE_RECURSIVE T_STRING
 	{
-		VMFrame frame;
-		$$ = context->HandleIncludeRecursive($2->Evaluate(frame), "*.conf", DebugInfoRange(@1, @2));
-		delete $2;
+		$$ = context->HandleIncludeRecursive($2, "*.conf", DebugInfoRange(@1, @2));
+		free($2);
 	}
-	| T_INCLUDE_RECURSIVE rterm ',' rterm
+	| T_INCLUDE_RECURSIVE T_STRING ',' T_STRING
 	{
-		VMFrame frame;
-		$$ = context->HandleIncludeRecursive($2->Evaluate(frame), $4->Evaluate(frame), DebugInfoRange(@1, @4));
-		delete $2;
-		delete $4;
+		$$ = context->HandleIncludeRecursive($2, $4, DebugInfoRange(@1, @4));
+		free($2);
+		free($4);
 	}
 	| T_IMPORT rterm
 	{