Software /
code /
prosody
Comparison
prosodyctl @ 7447:843fe134453e
Merge 0.10->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 30 May 2016 13:17:28 +0200 |
parent | 7359:a5a080c12c96 |
parent | 7445:6d2038147d3d |
child | 7456:76a8456cf1e2 |
comparison
equal
deleted
inserted
replaced
7444:45d28235ebe0 | 7447:843fe134453e |
---|---|
1259 elseif not cert:validat(os.time() + 86400*31) then | 1259 elseif not cert:validat(os.time() + 86400*31) then |
1260 print(" Certificate expires within one month.") | 1260 print(" Certificate expires within one month.") |
1261 end | 1261 end |
1262 if config.get(host, "component_module") == nil | 1262 if config.get(host, "component_module") == nil |
1263 and not x509_verify_identity(host, "_xmpp-client", cert) then | 1263 and not x509_verify_identity(host, "_xmpp-client", cert) then |
1264 print(" Not vaild for client connections to "..host..".") | 1264 print(" Not valid for client connections to "..host..".") |
1265 cert_ok = false | 1265 cert_ok = false |
1266 end | 1266 end |
1267 if (not (config.get(host, "anonymous_login") | 1267 if (not (config.get(host, "anonymous_login") |
1268 or config.get(host, "authentication") == "anonymous")) | 1268 or config.get(host, "authentication") == "anonymous")) |
1269 and not x509_verify_identity(host, "_xmpp-server", cert) then | 1269 and not x509_verify_identity(host, "_xmpp-server", cert) then |
1270 print(" Not vaild for server-to-server connections to "..host..".") | 1270 print(" Not valid for server-to-server connections to "..host..".") |
1271 cert_ok = false | 1271 cert_ok = false |
1272 end | 1272 end |
1273 end | 1273 end |
1274 end | 1274 end |
1275 end | 1275 end |