prosody
dfc369314e53
core/certmanager.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

core/certmanager.lua @ 3402:dfc369314e53

prosody.resolve_relative_path: Updated to take a parent path to resolve against.
author Waqas Hussain <waqas20@gmail.com>
date Fri, 23 Jul 2010 23:14:50 +0500
parent 3400:502a634f0578
child 3540:bc139431830b
line wrap: on
line diff
--- a/core/certmanager.lua	Fri Jul 23 23:09:58 2010 +0500
+++ b/core/certmanager.lua	Fri Jul 23 23:14:50 2010 +0500
@@ -15,6 +15,7 @@
 
 local prosody = prosody;
 local resolve_path = prosody.resolve_relative_path;
+local config_path = prosody.paths.config;
 
 module "certmanager"
 
@@ -31,11 +32,11 @@
 	local ssl_config = {
 		mode = mode;
 		protocol = user_ssl_config.protocol or "sslv23";
-		key = resolve_path(user_ssl_config.key);
+		key = resolve_path(config_path, user_ssl_config.key);
 		password = user_ssl_config.password;
-		certificate = resolve_path(user_ssl_config.certificate);
-		capath = resolve_path(user_ssl_config.capath or default_capath);
-		cafile = resolve_path(user_ssl_config.cafile);
+		certificate = resolve_path(config_path, user_ssl_config.certificate);
+		capath = resolve_path(config_path, user_ssl_config.capath or default_capath);
+		cafile = resolve_path(config_path, user_ssl_config.cafile);
 		verify = user_ssl_config.verify or "none";
 		options = user_ssl_config.options or "no_sslv2";
 		ciphers = user_ssl_config.ciphers;