prosody
fd1d4d96a708
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 @ 2743:fd1d4d96a708

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Fri, 05 Mar 2010 18:35:02 +0000
parent 2739:7339c2720b39
child 3355:9bb2da325d4d
child 3399:3976bad56640
line wrap: on
line diff
--- a/core/certmanager.lua	Mon Mar 01 21:03:17 2010 +0000
+++ b/core/certmanager.lua	Fri Mar 05 18:35:02 2010 +0000
@@ -3,7 +3,7 @@
 local ssl = ssl;
 local ssl_newcontext = ssl and ssl.newcontext;
 
-local setmetatable = setmetatable;
+local setmetatable, tostring = setmetatable, tostring;
 
 local prosody = prosody;
 
@@ -39,8 +39,10 @@
 					reason = "Check that the path is correct, and the file exists.";
 				elseif reason == "system lib" then
 					reason = "Previous error (see logs), or other system error.";
+				elseif reason == "(null)" or not reason then
+					reason = "Check that the file exists and the permissions are correct";
 				else
-					reason = "Reason: "..tostring(reason or "unknown"):lower();
+					reason = "Reason: "..tostring(reason):lower();
 				end
 				log("error", "SSL/TLS: Failed to load %s: %s", file, reason);
 			else