Fix missing IDO updates for groups

fixes #12527
Icinga · Aug 24, 2016 · bc88f81 · bc88f81
1 parent 614e0ac
commit bc88f81
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/lib/db_ido/hostdbobject.cpp b/lib/db_ido/hostdbobject.cpp
@@ -397,6 +397,11 @@ String HostDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
 
 	Host::Ptr host = static_pointer_cast<Host>(GetObject());
 
+	Array::Ptr groups = host->GetGroups();
+
+	if (groups)
+		hashData += DbObject::HashValue(groups);
+
 	Array::Ptr parents = new Array();
 
 	/* parents */

diff --git a/lib/db_ido/servicedbobject.cpp b/lib/db_ido/servicedbobject.cpp
@@ -357,6 +357,11 @@ String ServiceDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields)
 
 	Service::Ptr service = static_pointer_cast<Service>(GetObject());
 
+	Array::Ptr groups = service->GetGroups();
+
+	if (groups)
+		hashData += DbObject::HashValue(groups);
+
 	Array::Ptr dependencies = new Array();
 
 	/* dependencies */

diff --git a/lib/db_ido/userdbobject.cpp b/lib/db_ido/userdbobject.cpp
@@ -163,3 +163,17 @@ void UserDbObject::OnConfigUpdateHeavy(void)
 
 	DbObject::OnMultipleQueries(queries);
 }
+
+String UserDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) const
+{
+	String hashData = DbObject::CalculateConfigHash(configFields);
+
+	User::Ptr user = static_pointer_cast<User>(GetObject());
+
+	Array::Ptr groups = user->GetGroups();
+
+	if (groups)
+		hashData += DbObject::HashValue(groups);
+
+	return hashData;
+}
diff --git a/lib/db_ido/userdbobject.hpp b/lib/db_ido/userdbobject.hpp
@@ -43,6 +43,8 @@ class UserDbObject : public DbObject
 	virtual Dictionary::Ptr GetStatusFields(void) const override;
 
 	virtual void OnConfigUpdateHeavy(void) override;
+
+	virtual String CalculateConfigHash(const Dictionary::Ptr& configFields) const;
 };
 
 }