# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1279908890 -18000
# Node ID dfc369314e534e7496fa3f4a2cc2dc54339b061e
# Parent  2387f35db5c830fae4bb8d8d4f6653ef876e03d8
prosody.resolve_relative_path: Updated to take a parent path to resolve against.

diff -r 2387f35db5c8 -r dfc369314e53 core/certmanager.lua
--- 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;
diff -r 2387f35db5c8 -r dfc369314e53 prosody
--- a/prosody	Fri Jul 23 23:09:58 2010 +0500
+++ b/prosody	Fri Jul 23 23:14:50 2010 +0500
@@ -165,7 +165,7 @@
 	
 	local path_sep = package.config:sub(1,1);
 	local rel_path_start = ".."..path_sep;
-	function prosody.resolve_relative_path(path)
+	function prosody.resolve_relative_path(parent_path, path)
 		if path then
 			local is_relative;
 			if path_sep == "/" and path:sub(1,1) ~= "/" then
@@ -174,7 +174,7 @@
 				is_relative = true;
 			end
 			if is_relative then
-				return CFG_CONFIGDIR..path_sep..path;
+				return parent_path..path_sep..path;
 			end
 		end
 		return path;