tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix custom attributes with recursive macro function calls 

fixes #9073
This commit is contained in:
Michael Friedrich 2015-04-17 17:23:08 +02:00
parent 57cc7b195a
commit 201c41f2ca
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/macroprocessor.cpp
View File

@ -199,7 +199,7 @@ Value MacroProcessor::EvaluateFunction(const Function::Ptr& func, const Resolver
resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim, resolvers_this->Set("macro", new Function(boost::bind(&MacroProcessor::InternalResolveMacrosShim,
_1, boost::cref(resolvers), cr, missingMacro, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros, _1, boost::cref(resolvers), cr, missingMacro, MacroProcessor::EscapeCallback(), resolvedMacros, useResolvedMacros,
recursionLevel))); recursionLevel + 1)));
ScriptFrame frame(resolvers_this); ScriptFrame frame(resolvers_this);
return func->Invoke(); return func->Invoke();