From 913e35da9e70239b2be89cdab417a3a752016441 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 22 Aug 2014 13:46:32 +0200
Subject: [PATCH] Make sure that child zones accept commands from their parent
 zone

refs #6964
---
 lib/icinga/apievents.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/icinga/apievents.cpp b/lib/icinga/apievents.cpp
index 4d82e97bc..bb791c3ee 100644
--- a/lib/icinga/apievents.cpp
+++ b/lib/icinga/apievents.cpp
@@ -982,8 +982,14 @@ Value ApiEvents::UpdateRepositoryAPIHandler(const MessageOrigin& origin, const D
 
 Host::Ptr ApiEvents::FindHostByVirtualName(const String& hostName, const MessageOrigin& origin)
 {
-	if (origin.FromZone && hostName == "localhost")
-		return Host::GetByName(origin.FromZone->GetName());
-	else
-		return Host::GetByName(hostName);
+	if (origin.FromZone) {
+		Zone::Ptr my_zone = Zone::GetLocalZone();
+
+		if (origin.FromZone->IsChildOf(my_zone) && hostName == "localhost")
+			return Host::GetByName(origin.FromZone->GetName());
+		else if (!origin.FromZone->IsChildOf(my_zone) && hostName == my_zone->GetName())
+			return Host::GetByName("localhost");
+	}
+
+	return Host::GetByName(hostName);
 }