aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
committerKim Alvefur <zash@zash.se>2014-11-22 11:53:14 +0100
commitb690efb23ea66e96d671fc263aea71413188394f (patch)
tree98623423e23c23564e823ff65f6b5bca51f14de2
parent1875a89b0269a92b965298f3ca9f234630e11721 (diff)
parent49ba0ce08dd45d2438ddd1ee14d53da57cb9573e (diff)
downloadprosody-b690efb23ea66e96d671fc263aea71413188394f.tar.gz
prosody-b690efb23ea66e96d671fc263aea71413188394f.zip
Merge 0.10->trunk
-rw-r--r--core/certmanager.lua4
-rw-r--r--plugins/mod_tls.lua14
2 files changed, 8 insertions, 10 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 3454fcc4..7ad7b034 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -137,10 +137,8 @@ function create_context(host, mode, ...)
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()
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)