aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-06 14:48:00 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-06 14:48:00 +0100
commit1de31d1a085ea52a7de917b23b9c28b32747f864 (patch)
tree3a7b4f0cea8b5c8004464c99f02a175546c843d3 /plugins
parent55a1e9a4e2a78ad7d6a5a2a15c708dfaf0fcaaa0 (diff)
parent2d8a08de123cb93d21bd7015d90b8e5887e2ed54 (diff)
downloadprosody-1de31d1a085ea52a7de917b23b9c28b32747f864.tar.gz
prosody-1de31d1a085ea52a7de917b23b9c28b32747f864.zip
Merge 0.8->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_tls.lua7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 52e3512d..cace2d69 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -91,10 +91,9 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
end);
function module.load()
- local global_ssl_config = config.get("*", "core", "ssl");
- local ssl_config = config.get(module.host, "core", "ssl");
- local base_host = module.host:match("%.(.*)");
- if ssl_config == global_ssl_config and hosts[base_host] then
+ local ssl_config = config.rawget(module.host, "core", "ssl");
+ if not ssl_config then
+ local base_host = module.host:match("%.(.*)");
ssl_config = config.get(base_host, "core", "ssl");
end
host.ssl_ctx = create_context(host.host, "client", ssl_config); -- for outgoing connections