From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Thu, 12 May 2016 08:24:15 +0000 (+0200)
Subject: Fix incorrect variable names for joined fields in filter expressions
X-Git-Tag: v2.4.8~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f2fe64220566d27ba41501252bec55ccfd0995e;p=icinga2

Fix incorrect variable names for joined fields in filter expressions

fixes #11779
---

diff --git a/lib/remote/filterutility.cpp b/lib/remote/filterutility.cpp
index d5e8cd1b0..d9f50e7bc 100644
--- a/lib/remote/filterutility.cpp
+++ b/lib/remote/filterutility.cpp
@@ -123,7 +123,10 @@ bool FilterUtility::EvaluateFilter(ScriptFrame& frame, Expression *filter,
 
 		Object::Ptr joinedObj = target->NavigateField(fid);
 
-		vars->Set(field.Name, joinedObj);
+		if (field.NavigationName)
+			vars->Set(field.NavigationName, joinedObj);
+		else
+			vars->Set(field.Name, joinedObj);
 	}
 
 	return Convert::ToBool(filter->Evaluate(frame));