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

Fix that relative paths do not work with include_zones 

fixes #10828
This commit is contained in:
Michael Friedrich 2015-12-11 16:58:43 +01:00 committed by Gunnar Beutner
parent 2bc1d32caa
commit db0e8c676e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/config/configcompiler.cpp
View File

@ -212,14 +212,17 @@ Expression *ConfigCompiler::HandleIncludeZones(const String& relativeBase, const
const String& path, const String& pattern, const String& package, const DebugInfo&) const String& path, const String& pattern, const String& package, const DebugInfo&)
{ {
String ppath; String ppath;
String newRelativeBase = relativeBase;
if (path.GetLength() > 0 && path[0] == '/') if (path.GetLength() > 0 && path[0] == '/')
ppath = path; ppath = path;
else else {
ppath = relativeBase + "/" + path; ppath = relativeBase + "/" + path;
newRelativeBase = ".";
}
std::vector<Expression *> expressions; std::vector<Expression *> expressions;
Utility::Glob(ppath + "/*", boost::bind(&ConfigCompiler::HandleIncludeZone, relativeBase, tag, _1, pattern, package, boost::ref(expressions)), GlobDirectory); Utility::Glob(ppath + "/*", boost::bind(&ConfigCompiler::HandleIncludeZone, newRelativeBase, tag, _1, pattern, package, boost::ref(expressions)), GlobDirectory);
return new DictExpression(expressions); return new DictExpression(expressions);
} }