From 2d8a08de123cb93d21bd7015d90b8e5887e2ed54 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Wed, 6 Apr 2011 14:45:44 +0100
Subject: mod_tls: Fix for components to more reliably inherit SSL settings
from their parenthost (thanks Link Mauve)
---
plugins/mod_tls.lua | 7 +++----
1 file 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
--
cgit v1.2.3