aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2010-03-12 18:41:05 +0100
committerTobias Markmann <tm@ayena.de>2010-03-12 18:41:05 +0100
commitb05ccd7b3affed026faf4b492d91af972f5ae8ac (patch)
tree9dd7b38690fed8b235977def984797ba62ac50c7 /core
parent3a972b1742c28b7ef9cb5f76ed3bc69f752b5899 (diff)
parent456cd9c62a173637f18d2c613e3514919369ad90 (diff)
downloadprosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.tar.gz
prosody-b05ccd7b3affed026faf4b492d91af972f5ae8ac.zip
Merge with tip.
Diffstat (limited to 'core')
-rw-r--r--core/certmanager.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index 5794ba6e..fa920b91 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -3,7 +3,7 @@ local log = require "util.logger".init("certmanager");
local ssl = ssl;
local ssl_newcontext = ssl and ssl.newcontext;
-local setmetatable = setmetatable;
+local setmetatable, tostring = setmetatable, tostring;
local prosody = prosody;
@@ -39,8 +39,10 @@ function create_context(host, mode, config)
reason = "Check that the path is correct, and the file exists.";
elseif reason == "system lib" then
reason = "Previous error (see logs), or other system error.";
+ elseif reason == "(null)" or not reason then
+ reason = "Check that the file exists and the permissions are correct";
else
- reason = "Reason: "..tostring(reason or "unknown"):lower();
+ reason = "Reason: "..tostring(reason):lower();
end
log("error", "SSL/TLS: Failed to load %s: %s", file, reason);
else
@@ -54,7 +56,7 @@ function create_context(host, mode, config)
end
function reload_ssl_config()
- default_ssl_config = config.get("*", "core", "ssl");
+ default_ssl_config = configmanager.get("*", "core", "ssl");
end
prosody.events.add_handler("config-reloaded", reload_ssl_config);