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

Make sure templates are never evaluated on their own

Browse Source 
fixes #7536
This commit is contained in:
Gunnar Beutner 2014-10-31 17:52:47 +01:00
parent 6bc2938996
commit 1811f8689b
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cli/objectlistcommand.cpp
View File

@ -134,15 +134,9 @@ void ObjectListCommand::PrintObject(std::ostream& fp, bool& first, const String&
else else
fp << "\n"; fp << "\n";
bool abstract = object->Get("abstract");
Dictionary::Ptr debug_hints = object->Get("debug_hints"); Dictionary::Ptr debug_hints = object->Get("debug_hints");
if (abstract) fp << "Object " << ConsoleColorTag(Console_ForegroundBlue | Console_Bold) << internal_name << ConsoleColorTag(Console_Normal) << "'";
fp << "Template '";
else
fp << "Object '";
fp << ConsoleColorTag(Console_ForegroundBlue | Console_Bold) << internal_name << ConsoleColorTag(Console_Normal) << "'";
fp << " of type '" << ConsoleColorTag(Console_ForegroundMagenta | Console_Bold) << type << ConsoleColorTag(Console_Normal) << "':\n"; fp << " of type '" << ConsoleColorTag(Console_ForegroundMagenta | Console_Bold) << type << ConsoleColorTag(Console_Normal) << "':\n";
PrintProperties(fp, properties, debug_hints, 2); PrintProperties(fp, properties, debug_hints, 2);

5
lib/config/configitem.cpp
View File

@ -121,6 +121,7 @@ Expression::Ptr ConfigItem::GetExpressionList(void) const
Dictionary::Ptr ConfigItem::GetProperties(void) Dictionary::Ptr ConfigItem::GetProperties(void)
{ {
ASSERT(!OwnsLock()); ASSERT(!OwnsLock());
VERIFY(!IsAbstract());
ObjectLock olock(this); ObjectLock olock(this);
@ -296,11 +297,13 @@ void ConfigItem::WriteObjectsFile(const String& filename)
BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) { BOOST_FOREACH(const ItemMap::value_type& kv, m_Items) {
ConfigItem::Ptr item = kv.second; ConfigItem::Ptr item = kv.second;
if (item->IsAbstract())
continue;
Dictionary::Ptr persistentItem = make_shared<Dictionary>(); Dictionary::Ptr persistentItem = make_shared<Dictionary>();
persistentItem->Set("type", item->GetType()); persistentItem->Set("type", item->GetType());
persistentItem->Set("name", item->GetName()); persistentItem->Set("name", item->GetName());
persistentItem->Set("abstract", item->IsAbstract());
persistentItem->Set("properties", item->GetProperties()); persistentItem->Set("properties", item->GetProperties());
persistentItem->Set("debug_hints", item->GetDebugHints()); persistentItem->Set("debug_hints", item->GetDebugHints());