aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-11-09 13:40:06 +0100
committerKim Alvefur <zash@zash.se>2015-11-09 13:40:06 +0100
commit57fe905a8c3eeffb507a0967512a4caccb0e882b (patch)
treea7ec5809f168f7cc24180b4116b11f298060b41e
parentedc807903201f089ef85b107b4900375a82a26f1 (diff)
downloadprosody-57fe905a8c3eeffb507a0967512a4caccb0e882b.tar.gz
prosody-57fe905a8c3eeffb507a0967512a4caccb0e882b.zip
mod_tls: Fix ssl option fallback to a "parent" host if current host does not have ssl options set (thanks 70b1)
-rw-r--r--plugins/mod_tls.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 365be69e..69aafe82 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -45,11 +45,11 @@ do
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