diff options
| author | Kim Alvefur <zash@zash.se> | 2014-11-22 11:51:54 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-11-22 11:51:54 +0100 |
| commit | a5fc6e29d9e9518715972d20c11d89d7a1434648 (patch) | |
| tree | a107c6b235bdc0c90990a566f221a810ea3ffc9b /plugins | |
| parent | b32f290795cd6fa60cca8433399eec5fe561bbbc (diff) | |
| download | prosody-a5fc6e29d9e9518715972d20c11d89d7a1434648.tar.gz prosody-a5fc6e29d9e9518715972d20c11d89d7a1434648.zip | |
certmanager, mod_tls: Return final ssl config as third return value (fix for c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_tls.lua | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua index d9670d73..f9d2cee9 100644 --- a/plugins/mod_tls.lua +++ b/plugins/mod_tls.lua @@ -34,7 +34,7 @@ local host = hosts[module.host]; 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 @@ do 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) |