Merge 0.7->0.8

[prosody.git] / core / certmanager.lua

diff --git a/core/certmanager.lua b/core/certmanager.lua
index eadddd788965ce59350d1cc2f18835360ee9596c..7f1ca42eebaad0676caf017608b3f6c12a4d0e7d 100644 (file)
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -14,7 +14,7 @@ local ssl_newcontext = ssl and ssl.newcontext;
 local setmetatable, tostring = setmetatable, tostring;
 
 local prosody = prosody;
-local resolve_path = prosody.resolve_relative_path;
+local resolve_path = configmanager.resolve_relative_path;
 local config_path = prosody.paths.config;
 
 module "certmanager"
@@ -23,8 +23,8 @@ module "certmanager"
 local default_ssl_config = configmanager.get("*", "core", "ssl");
 local default_capath = "/etc/ssl/certs";
 
-function create_context(host, mode, config)
-       local user_ssl_config = config and config.core.ssl or default_ssl_config;
+function create_context(host, mode, user_ssl_config)
+       user_ssl_config = user_ssl_config or default_ssl_config;
 
        if not ssl then return nil, "LuaSec (required for encryption) was not found"; end
        if not user_ssl_config then return nil, "No SSL/TLS configuration present for "..host; end
@@ -69,8 +69,8 @@ function create_context(host, mode, config)
                else
                        log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
                end
-        end
-        return ctx, err;
+       end
+       return ctx, err;
 end
 
 function reload_ssl_config()