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

Fix arrays in command arguments 

fixes #8869
This commit is contained in:
Gunnar Beutner 2015-03-26 09:29:52 +01:00
parent c08aa37c99
commit 3adec4576c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/icinga/macroprocessor.cpp
View File

@ -54,8 +54,13 @@ Value MacroProcessor::ResolveMacros(const Value& str, const ResolverList& resolv
BOOST_FOREACH(const Value& arg, arr) { BOOST_FOREACH(const Value& arg, arr) {
/* Note: don't escape macros here. */ /* Note: don't escape macros here. */
resultArr->Add(InternalResolveMacros(arg, resolvers, cr, missingMacro, Value value = InternalResolveMacros(arg, resolvers, cr, missingMacro,
EscapeCallback(), resolvedMacros, useResolvedMacros)); EscapeCallback(), resolvedMacros, useResolvedMacros);
if (value.IsObjectType<Array>())
resultArr->Add(Utility::Join(value, ';'));
else
resultArr->Add(value);
} }
result = resultArr; result = resultArr;