Software / code / prosody
Changeset
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 |
| parents | 3401:2387f35db5c8 |
| children | 3403:b89680015b7b |
| files | core/certmanager.lua prosody |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
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;
--- 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;
