diff options
| author | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
| commit | 094164e5f0bf835e4fd1dcefa57f3bb4add8325d (patch) | |
| tree | 3e6fc617741dec52b661ba121b7949d6b284399d /plugins/mod_tls.lua | |
| parent | 1173ee03d3daede409447b6eb049c1ca06145f50 (diff) | |
| parent | 57fe905a8c3eeffb507a0967512a4caccb0e882b (diff) | |
| download | prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.tar.gz prosody-094164e5f0bf835e4fd1dcefa57f3bb4add8325d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_tls.lua')
| -rw-r--r-- | plugins/mod_tls.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index 39c4649e..69aafe82 100644 --- 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 |