aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-08-24 23:27:58 +0100
committerMatthew Wild <mwild1@gmail.com>2010-08-24 23:27:58 +0100
commitfff700e7df31e157506b651826505c49c7de3c62 (patch)
tree4bd06685bfc297f3bcd8e2b89cd16db728c7972d
parent373662e4a695ef9d75381173eb4efb439e91d91b (diff)
downloadprosody-fff700e7df31e157506b651826505c49c7de3c62.tar.gz
prosody-fff700e7df31e157506b651826505c49c7de3c62.zip
componentmanager: Relocate disallow_s2s to its correct position (thanks darkhoptipomatus)
-rw-r--r--core/componentmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 1f0fa81f..14d9c06d 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -42,7 +42,6 @@ function load_enabled_components(config)
if host ~= "*" and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
hosts[host] = create_component(host);
hosts[host].connected = false;
- disallow_s2s = configmanager.get(host, "core", "disallow_s2s");
components[host] = default_component_handler;
local ok, err = modulemanager.load(host, host_config.core.component_module);
if not ok then
@@ -95,7 +94,8 @@ function create_component(host, component, events)
end
return { type = "component", host = host, connected = true, s2sout = {},
ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new(),
- dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen() };
+ dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(),
+ disallow_s2s = configmanager.get(host, "core", "disallow_s2s"); };
end
function register_component(host, component, session)