Merge 0.6->0.7

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index 5794ba6ecf2b9c94784e301fd5e4e553bc48e534..3dd06585fa667e3cd2d96f8dc17eb43938861d30 100644 (file)
--- 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,22 +39,25 @@ 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
                                log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
                        end
-                       ssl = false
                end
                return ctx, err;
+       elseif not ssl then
+               return nil, "LuaSec (required for encryption) was not found";
        end
-       return nil;
+       return nil, "No SSL/TLS configuration present for "..host;
 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);