diff options
| author | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-04-03 06:39:28 +0200 |
| commit | 12d6e03b5b62d8974f98492112a70fc754b5cb28 (patch) | |
| tree | 0ddb52bfa4a521df1e6ef7b9f54e3e3d615597a2 /prosodyctl | |
| parent | 315e3b3b937c22224c4530a194420f1b2fd77316 (diff) | |
| parent | 28c58565ace33870970010c9d195c5da5d9cf4d1 (diff) | |
| download | prosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.tar.gz prosody-12d6e03b5b62d8974f98492112a70fc754b5cb28.zip | |
Merge 0.10->trunk
Diffstat (limited to 'prosodyctl')
| -rwxr-xr-x | prosodyctl | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -552,6 +552,7 @@ function commands.about(arg) 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 @@ function commands.check(arg) 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") |