upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-07-15 19:52:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge 0332ead94b into 8ff3d586f9

Browse source
This commit is contained in:
Julian Brost 2026-07-09 18:27:07 +02:00 committed by GitHub
commit 20791de41a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/base/configobject.cpp
View file

@ -92,6 +92,7 @@ public:
void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool updateVersion)
{
Dictionary::Ptr original_attributes = GetOriginalAttributes();
std::vector<std::pair<String, Value>> orig_attr_updates;
bool updated_original_attributes = false;
Type::Ptr type = GetReflectionType();
@ -161,15 +162,11 @@ void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool
oldValue = dict->Get(key).Clone();
if (field.Attributes & FAConfig) {
updated_original_attributes = true;
if (oldValue.IsObjectType<Dictionary>()) {
Dictionary::Ptr oldDict = oldValue;
ObjectLock olock(oldDict);
for (const auto& kv : oldDict) {
String key = prefix + "." + kv.first;
if (!original_attributes->Contains(key))
original_attributes->Set(key, kv.second);
orig_attr_updates.emplace_back(prefix + "." + kv.first, kv.second);
}
/* store the new value as null */
@ -177,13 +174,12 @@ void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool
Dictionary::Ptr valueDict = value;
ObjectLock olock(valueDict);
for (const auto& kv : valueDict) {
String key = attr + "." + kv.first;
if (!original_attributes->Contains(key))
original_attributes->Set(key, Empty);
orig_attr_updates.emplace_back(attr + "." + kv.first, Empty);
}
}
} else if (!original_attributes->Contains(attr))
original_attributes->Set(attr, oldValue);
} else {
orig_attr_updates.emplace_back(attr, oldValue);
}
}
dict->Set(key, value);
@ -191,16 +187,20 @@ void ConfigObject::ModifyAttribute(const String& attr, const Value& value, bool
newValue = value;
if (field.Attributes & FAConfig) {
if (!original_attributes->Contains(attr)) {
updated_original_attributes = true;
original_attributes->Set(attr, oldValue);
}
orig_attr_updates.emplace_back(attr, oldValue);
}
}
ModAttrValidationUtils utils;
ValidateField(fid, Lazy<Value>{newValue}, utils);
for (auto &[key, val] : orig_attr_updates) {
if (!original_attributes->Contains(key)) {
updated_original_attributes = true;
original_attributes->Set(key, std::move(val));
}
}
SetField(fid, newValue);
if (updateVersion && (field.Attributes & FAConfig))