aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-13 18:31:34 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-13 18:31:34 +0100
commit3c5b09b7f1c1eddf57605e7651ae9790f3bbfc7a (patch)
treed623bc815c27a8e2141421fc54f7fbbc61ac1a21
parent184e6cad288c8d51ed5a9eda5b9c7d378317fad2 (diff)
downloadprosody-3c5b09b7f1c1eddf57605e7651ae9790f3bbfc7a.tar.gz
prosody-3c5b09b7f1c1eddf57605e7651ae9790f3bbfc7a.zip
configmanager: Fix include of relative files via Include directive in config
-rw-r--r--core/configmanager.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index 8fea3be5..51b9f5fe 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -247,11 +247,10 @@ do
end
end
else
+ local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
local f, err = io.open(file);
if f then
- local data = f:read("*a");
- local file = resolve_relative_path(config_file:gsub("[^"..path_sep.."]+$", ""), file);
- local ret, err = parsers.lua.load(data, file, config);
+ local ret, err = parsers.lua.load(f:read("*a"), file, config);
if not ret then error(err:gsub("%[string.-%]", file), 0); end
end
if not f then error("Error loading included "..file..": "..err, 0); end