]> granicus.if.org Git - icinga2/commitdiff
Fix custom attributes with recursive macro function calls
authorMichael Friedrich <michael.friedrich@netways.de>
Fri, 17 Apr 2015 15:23:08 +0000 (17:23 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Fri, 17 Apr 2015 15:23:08 +0000 (17:23 +0200)
fixes #9073

lib/icinga/macroprocessor.cpp

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