aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-07-23 09:22:27 +0100
committerMatthew Wild <mwild1@gmail.com>2010-07-23 09:22:27 +0100
commit5623158b4443965b7113cfdf0734ad5d20e216b4 (patch)
treece30e03863a984fa746fce3ec3264991336ba8d6
parent7ddf7d4745c571110a29a9e63d97c868ae154b73 (diff)
parentbb6d7b0d22622dce365e26793093b11b4582795b (diff)
downloadprosody-5623158b4443965b7113cfdf0734ad5d20e216b4.tar.gz
prosody-5623158b4443965b7113cfdf0734ad5d20e216b4.zip
Merge 0.7->trunk
-rw-r--r--core/certmanager.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index ff5506a3..f640a430 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -25,7 +25,8 @@ 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;
- if not(ssl and user_ssl_config) then return nil; end
+ 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
local ssl_config = {
mode = mode;
@@ -67,7 +68,6 @@ function create_context(host, mode, config)
else
log("error", "SSL/TLS: Error initialising for host %s: %s", host, err );
end
- ssl = false
end
return ctx, err;
end