Software / code / prosody
Changeset
6527:074a41ee0409
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 22 Nov 2014 11:53:14 +0100 |
| parents | 6525:7c273da3cff6 (current diff) 6526:873538f0b18c (diff) |
| children | 6534:b89406fa076c |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/core/certmanager.lua Thu Nov 20 15:01:47 2014 +0100 +++ b/core/certmanager.lua Sat Nov 22 11:53:14 2014 +0100 @@ -137,10 +137,8 @@ else log("error", "SSL/TLS: Error initialising for %s: %s", host, err); end - else - err = nil; end - return ctx, err or user_ssl_config; + return ctx, err, user_ssl_config; end function reload_ssl_config()
--- a/plugins/mod_tls.lua Thu Nov 20 15:01:47 2014 +0100 +++ b/plugins/mod_tls.lua Sat Nov 22 11:53:14 2014 +0100 @@ -34,7 +34,7 @@ local ssl_ctx_c2s, ssl_ctx_s2sout, ssl_ctx_s2sin; local ssl_cfg_c2s, ssl_cfg_s2sout, ssl_cfg_s2sin; do - local NULL = {}; + local NULL, err = {}; local global = module:context("*"); local parent = module:context(module.host:match("%.(.*)$")); @@ -49,14 +49,14 @@ local parent_s2s = parent:get_option("s2s_ssl", NULL); local host_s2s = module:get_option("s2s_ssl", parent_s2s); - ssl_ctx_c2s, 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", ssl_cfg_c2s); end + 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 - ssl_ctx_s2sout, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections - if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", ssl_cfg_s2sin); end + ssl_ctx_s2sout, err, ssl_cfg_s2sout = create_context(host.host, "client", host_s2s, host_ssl, global_s2s); -- for outgoing server connections + if not ssl_ctx_s2sout then module:log("error", "Error creating contexts for s2sout: %s", err); end - ssl_ctx_s2sin, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections - if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", ssl_cfg_s2sin); end + ssl_ctx_s2sin, err, ssl_cfg_s2sin = create_context(host.host, "server", host_s2s, host_ssl, global_s2s); -- for incoming server connections + if not ssl_ctx_s2sin then module:log("error", "Error creating contexts for s2sin: %s", err); end end local function can_do_tls(session)
