Software / code / prosody
Changeset
3469:011566d72331
componentmanager: Relocate disallow_s2s to its correct position (thanks darkhoptipomatus)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Tue, 24 Aug 2010 23:27:58 +0100 |
| parents | 3468:d50e2c937717 |
| children | 3470:0e59b5cdd57b |
| files | core/componentmanager.lua |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/componentmanager.lua Mon Aug 23 16:54:56 2010 +0500 +++ b/core/componentmanager.lua Tue Aug 24 23:27:58 2010 +0100 @@ -42,7 +42,6 @@ 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 @@ 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)
