mod_tls: Let hosts without an 'ssl' option inherit it from their parent hosts.

diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index a80f230e527ade1658b1c8074c0de4a4a464b903..c79227e1748bb673a278cb09d6a736afc6fafcab 100644 (file)
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -6,6 +6,7 @@
 -- COPYING file in the source package for more information.
 --
 
+local config = require "core.configmanager";
 local create_context = require "core.certmanager".create_context;
 local st = require "util.stanza";
 
@@ -90,7 +91,12 @@ module:hook_stanza(xmlns_starttls, "proceed", function (session, stanza)
 end);
 
 function module.load()
-       local ssl_config = module:get_option("ssl");
+       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
+               ssl_config = config.get(base_host, "core", "ssl");
+       end
        host.ssl_ctx = create_context(host.host, "client", ssl_config); -- for outgoing connections
        host.ssl_ctx_in = create_context(host.host, "server", ssl_config); -- for incoming connections
 end