tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8316 from Icinga/bugfix/ido-hash-groups

Browse Source 
*DbObject#CalculateConfigHash(): sort groups to be hashed
This commit is contained in:
Alexander Aleksandrovič Klimov 2020-10-13 14:54:05 +02:00 committed by GitHub
commit 5ee7eb8f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/db_ido/hostdbobject.cpp
View File

@ -356,8 +356,12 @@ String HostDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
Array::Ptr groups = host->GetGroups(); Array::Ptr groups = host->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
ArrayData parents; ArrayData parents;

6
lib/db_ido/servicedbobject.cpp
View File

@ -308,8 +308,12 @@ String ServiceDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields)
Array::Ptr groups = service->GetGroups(); Array::Ptr groups = service->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
ArrayData dependencies; ArrayData dependencies;

6
lib/db_ido/userdbobject.cpp
View File

@ -150,8 +150,12 @@ String UserDbObject::CalculateConfigHash(const Dictionary::Ptr& configFields) co
Array::Ptr groups = user->GetGroups(); Array::Ptr groups = user->GetGroups();
if (groups) if (groups) {
groups = groups->ShallowClone();
ObjectLock oLock (groups);
std::sort(groups->Begin(), groups->End());
hashData += DbObject::HashValue(groups); hashData += DbObject::HashValue(groups);
}
return SHA256(hashData); return SHA256(hashData);
} }