Diff

prosodyctl @ 6614:c78f8f8f4434

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Fri, 03 Apr 2015 06:39:28 +0200
parent 6612:6cc48b51d699
child 6637:ecc039288edc
line wrap: on
line diff
--- a/prosodyctl	Fri Mar 27 22:24:57 2015 +0000
+++ b/prosodyctl	Fri Apr 03 06:39:28 2015 +0200
@@ -552,6 +552,7 @@
 			if not hgid and hgrepo then
 				return path.." - "..hgrepo .."!\n  ";
 			end
+			-- 010452cfaf53 is the first commit in the prosody-modules repository
 			hgrepo = hgrepo == "010452cfaf53" and "prosody-modules";
 			return path..(hgid and " - "..(hgrepo or "HG").." rev: "..hgid or "")
 				.."\n  ";
@@ -1093,7 +1094,7 @@
 		local x509_verify_identity = require"util.x509".verify_identity;
 		local ssl = dependencies.softreq"ssl";
 		-- local datetime_parse = require"util.datetime".parse_x509;
-		local load_cert = ssl and ssl.x509 and ssl.x509.load;
+		local load_cert = ssl and ssl.loadcertificate;
 		-- or ssl.cert_from_pem
 		if not ssl then
 			print("LuaSec not available, can't perform certificate checks")