aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-14 18:41:44 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-14 18:41:44 +0000
commit8b0ec93370f16cb2b4da3a2dd7734d6d41175312 (patch)
treeac57a11e0afe1b7a713afe583da2ca7882f2f446
parent107527504299072512920fe9374f85cf7687c694 (diff)
downloadprosody-8b0ec93370f16cb2b4da3a2dd7734d6d41175312.tar.gz
prosody-8b0ec93370f16cb2b4da3a2dd7734d6d41175312.zip
configmanager: Error when a component and host clash hostnames
-rw-r--r--core/configmanager.lua15
1 files changed, 13 insertions, 2 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index 1fbe83b8..7ae472f6 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -9,8 +9,11 @@
local _G = _G;
-local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type =
- setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
+local setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, format =
+ setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type, pairs, table, string.format;
+
+
+local trb = debug.traceback
local eventmanager = require "core.eventmanager";
@@ -115,6 +118,10 @@ do
rawset(env, "__currenthost", "*") -- Default is global
function env.Host(name)
+ if rawget(config, name) and rawget(config[name].core, "component_module") then
+ error(format("Host %q clashes with previously defined %s Component %q, for services use a sub-domain like conference.%s",
+ name, config[name].core.component_module:gsub("^%a+$", { component = "external", muc = "MUC"}), name, name), 0);
+ end
rawset(env, "__currenthost", name);
-- Needs at least one setting to logically exist :)
set(name or "*", "core", "defined", true);
@@ -122,6 +129,10 @@ do
env.host = env.Host;
function env.Component(name)
+ if rawget(config, name) and rawget(config[name].core, "defined") and not rawget(config[name].core, "component_module") then
+ error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s",
+ name, name, name), 0);
+ end
set(name, "core", "component_module", "component");
-- Don't load the global modules by default
set(name, "core", "load_global_modules", false);