]> granicus.if.org Git - icinga2/commitdiff
Fixed global macros.
authorGunnar Beutner <gunnar.beutner@netways.de>
Fri, 13 Jul 2012 09:40:57 +0000 (11:40 +0200)
committerGunnar Beutner <gunnar.beutner@netways.de>
Fri, 13 Jul 2012 09:40:57 +0000 (11:40 +0200)
components/convenience/conveniencecomponent.cpp

index 0f32a63fc2c7e2917828abcf6ab50a8c22779ef1..8c7632fc79dcbcafddda4f5ac174d132a7ff7911 100644 (file)
@@ -56,7 +56,10 @@ void ConvenienceComponent::HostAddedHandler(const ConfigItem::Ptr& item)
 
 void ConvenienceComponent::CopyServiceAttributes(const ConfigObject::Ptr& host, const Dictionary::Ptr& service, const ConfigItemBuilder::Ptr& builder)
 {
-       Dictionary::Ptr macros; 
+       /* TODO: we only need to copy macros if this is an inline definition,
+        * i.e. host->GetProperties() != service, however for now we just
+        * copy them anyway. */
+       Dictionary::Ptr macros;
        if (service->Get("macros", &macros))
                builder->AddExpression("macros", OperatorPlus, macros);