From: Michael Friedrich <Michael.Friedrich@netways.de>
Date: Thu, 1 May 2014 21:53:38 +0000 (+0200)
Subject: Group assign requires object.groups update too (for apply rules).
X-Git-Tag: v0.0.11~101^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b268e7d32d18130f79cd9dfc2625710276102463;p=icinga2

Group assign requires object.groups update too (for apply rules).

Refs #6105
---

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index cc6d2ac6e..d57de68cb 100644
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -66,6 +66,9 @@ bool HostGroup::EvaluateObjectRule(const Host::Ptr host, const ObjectRule& rule)
 	/* assign host group membership */
 	group->ResolveGroupMembership(host, true);
 
+	/* update groups attribute for apply */
+	host->AddGroup(group_name);
+
 	return true;
 }
 
diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 09f82cc43..9a2d0bcb5 100644
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -70,6 +70,9 @@ bool ServiceGroup::EvaluateObjectRule(const Service::Ptr service, const ObjectRu
 	/* assign service group membership */
 	group->ResolveGroupMembership(service, true);
 
+	/* update groups attribute for apply */
+	service->AddGroup(group_name);
+
 	return true;
 }
 
diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index 2ee963709..1735d24a6 100644
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -66,6 +66,9 @@ bool UserGroup::EvaluateObjectRule(const User::Ptr user, const ObjectRule& rule)
 	/* assign user group membership */
 	group->ResolveGroupMembership(user, true);
 
+	/* update groups attribute for apply */
+	user->AddGroup(group_name);
+
 	return true;
 }