mod_tls: Fix for components to more reliably inherit SSL settings from their parentho...
authorMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:45:44 +0000 (14:45 +0100)
committerMatthew Wild <mwild1@gmail.com>
Wed, 6 Apr 2011 13:45:44 +0000 (14:45 +0100)
plugins/mod_tls.lua

index 52e3512d0e53d3aef93087475101769f078c7cd2..cace2d693efb530b26eadb633342aa101d55533c 100644 (file)
@@ -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