diff options
| author | Kim Alvefur <zash@zash.se> | 2015-11-09 13:40:06 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-11-09 13:40:06 +0100 |
| commit | 5d077a0c17dbe89c2481cdebd18f4051dd2d10ae (patch) | |
| tree | a7ec5809f168f7cc24180b4116b11f298060b41e /plugins | |
| parent | 4c05e2b5f42e942ddda3e5f62dc6f9d8e7abe948 (diff) | |
| download | prosody-5d077a0c17dbe89c2481cdebd18f4051dd2d10ae.tar.gz prosody-5d077a0c17dbe89c2481cdebd18f4051dd2d10ae.zip | |
mod_tls: Fix ssl option fallback to a "parent" host if current host does not have ssl options set (thanks 70b1)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_tls.lua | 4 |
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 |