Fix variable scope for object rules

diff --git a/lib/config/objectrule.cpp b/lib/config/objectrule.cpp
index 36525ff0b866a4b2afaca2c39f2fe0376034a241..de6247a4a25ed1fdba777b4f1e2f2b3be123766c 100644 (file)
--- a/lib/config/objectrule.cpp
+++ b/lib/config/objectrule.cpp
@@ -65,10 +65,7 @@ void ObjectRule::AddRule(const String& sourceType, const String& name,
 
 bool ObjectRule::EvaluateFilter(const Dictionary::Ptr& scope) const
 {
-       scope->Set("__parent", m_Scope);
-       bool result = m_Filter->Evaluate(scope);
-       scope->Remove("__parent");
-       return result;
+       return m_Filter->Evaluate(scope);
 }
 
 void ObjectRule::EvaluateRules(bool clear)

diff --git a/lib/icinga/hostgroup.cpp b/lib/icinga/hostgroup.cpp
index dc88c06be75ba99c30d66409c403f523171b8a06..312378df61bc63a299ae988392e2327a0497c06d 100644 (file)
--- a/lib/icinga/hostgroup.cpp
+++ b/lib/icinga/hostgroup.cpp
@@ -46,6 +46,7 @@ bool HostGroup::EvaluateObjectRuleOne(const Host::Ptr& host, const ObjectRule& r
        CONTEXT(msgbuf.str());
 
        Dictionary::Ptr locals = make_shared<Dictionary>();
+       locals->Set("__parent", rule.GetScope());
        locals->Set("host", host);
 
        if (!rule.EvaluateFilter(locals))

diff --git a/lib/icinga/servicegroup.cpp b/lib/icinga/servicegroup.cpp
index 1bb570fb3ce14e94e551bc5a755751e674c730d0..de084c5b790b8bee68095bb709c74a368e9c57ef 100644 (file)
--- a/lib/icinga/servicegroup.cpp
+++ b/lib/icinga/servicegroup.cpp
@@ -48,6 +48,7 @@ bool ServiceGroup::EvaluateObjectRuleOne(const Service::Ptr& service, const Obje
        Host::Ptr host = service->GetHost();
 
        Dictionary::Ptr locals = make_shared<Dictionary>();
+       locals->Set("__parent", rule.GetScope());
        locals->Set("host", host);
        locals->Set("service", service);
 

diff --git a/lib/icinga/usergroup.cpp b/lib/icinga/usergroup.cpp
index 53d0d476aaf13d2b5ebf1c31329291ba4fadf4c9..a8b56c8a3b684490c9cabe90b439ae6c4cf5959b 100644 (file)
--- a/lib/icinga/usergroup.cpp
+++ b/lib/icinga/usergroup.cpp
@@ -46,6 +46,7 @@ bool UserGroup::EvaluateObjectRuleOne(const User::Ptr& user, const ObjectRule& r
        CONTEXT(msgbuf.str());
 
        Dictionary::Ptr locals = make_shared<Dictionary>();
+       locals->Set("__parent", rule.GetScope());
        locals->Set("user", user);
 
        if (!rule.EvaluateFilter(locals))