Merge 0.10->trunk

[prosody.git] / plugins / mod_tls.lua

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 39c4649e97206bf2a51dbed349abf439ed016fc7..69aafe82d90043e540ac9964d03862a6dea44653 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -40,17 +40,16 @@ do
        local modhost = module.host;
        local parent = modhost:match("%.(.*)$");
 
-       local global_ssl = rawgetopt("*",     "ssl") or NULL;
        local parent_ssl = rawgetopt(parent,  "ssl") or NULL;
        local host_ssl   = rawgetopt(modhost, "ssl") or parent_ssl;
 
        local global_c2s = rawgetopt("*",     "c2s_ssl") or NULL;
        local parent_c2s = rawgetopt(parent,  "c2s_ssl") or NULL;
-       local host_c2s   = rawgetopt(modhost, "c2s_ssl") or parent_ssl;
+       local host_c2s   = rawgetopt(modhost, "c2s_ssl") or parent_c2s;
 
        local global_s2s = rawgetopt("*",     "s2s_ssl") or NULL;
        local parent_s2s = rawgetopt(parent,  "s2s_ssl") or NULL;
-       local host_s2s   = rawgetopt(modhost, "s2s_ssl") or parent_ssl;
+       local host_s2s   = rawgetopt(modhost, "s2s_ssl") or parent_s2s;
 
        ssl_ctx_c2s, err, ssl_cfg_c2s = create_context(host.host, "server", host_c2s, host_ssl, global_c2s); -- for incoming client connections
        if not ssl_ctx_c2s then module:log("error", "Error creating context for c2s: %s", err); end