Merge 0.9->trunk

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 52e3512d0e53d3aef93087475101769f078c7cd2..707ae8f5aecb530430f0aa9e582b03ddb39323e7 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -75,7 +75,7 @@ end);
 module:hook_stanza("http://etherx.jabber.org/streams", "features", function (session, stanza)
        module:log("debug", "Received features element");
        if can_do_tls(session) and stanza:child_with_ns(xmlns_starttls) then
-               module:log("%s is offering TLS, taking up the offer...", session.to_host);
+               module:log("debug", "%s is offering TLS, taking up the offer...", session.to_host);
                session.sends2s("<starttls xmlns='"..xmlns_starttls.."'/>");
                return true;
        end
@@ -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