aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-11-10 02:32:14 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-11-10 02:32:14 +0500
commit91913dda6661e966beadebac0393613e137ff215 (patch)
tree2d86cd8dd8b8e825c90ce456a518ce26bbf14471 /core
parent86eb430400e9b0d3e50c73b3b9f4464ce81e79e6 (diff)
downloadprosody-91913dda6661e966beadebac0393613e137ff215.tar.gz
prosody-91913dda6661e966beadebac0393613e137ff215.zip
componentmanager: Removed SSL context creation (mod_tls handles that now).
Diffstat (limited to 'core')
-rw-r--r--core/componentmanager.lua19
1 files changed, 1 insertions, 18 deletions
diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 8e4b9c2a..ea1fe868 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -16,7 +16,6 @@ local fire_event = prosody.events.fire_event;
local events_new = require "util.events".new;
local st = require "util.stanza";
local prosody, hosts = prosody, prosody.hosts;
-local ssl = ssl;
local uuid_gen = require "util.uuid".generate;
local pairs, setmetatable, type, tostring = pairs, setmetatable, type, tostring;
@@ -76,24 +75,8 @@ end
function create_component(host, component, events)
-- TODO check for host well-formedness
- local ssl_ctx, ssl_ctx_in;
- if host and ssl then
- -- We need to find SSL context to use...
- -- Discussion in prosody@ concluded that
- -- 1 level back is usually enough by default
- local base_host = host:gsub("^[^%.]+%.", "");
- if hosts[base_host] then
- ssl_ctx = hosts[base_host].ssl_ctx;
- ssl_ctx_in = hosts[base_host].ssl_ctx_in;
- else
- -- We have no cert, and no parent host to borrow a cert from
- -- Use global/default cert if there is one
- ssl_ctx = certmanager.create_context(host, "client");
- ssl_ctx_in = certmanager.create_context(host, "server");
- end
- end
return { type = "component", host = host, connected = true, s2sout = {},
- ssl_ctx = ssl_ctx, ssl_ctx_in = ssl_ctx_in, events = events or events_new(),
+ events = events or events_new(),
dialback_secret = configmanager.get(host, "core", "dialback_secret") or uuid_gen(),
disallow_s2s = configmanager.get(host, "core", "disallow_s2s"); };
end