prosody
0c363fddcdd9
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 6647:0c363fddcdd9

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 03 May 2015 18:39:27 +0200
parent 6637:ecc039288edc
child 6711:76683a3f3d75
comparison
equal deleted inserted replaced
6636:441f8cb0deec 6647:0c363fddcdd9
1144 print(" Not vaild for client connections to "..host..".") 1144 print(" Not vaild for client connections to "..host..".")
1145 cert_ok = false 1145 cert_ok = false
1146 end 1146 end
1147 if (not (config.get(host, "anonymous_login") 1147 if (not (config.get(host, "anonymous_login")
1148 or config.get(host, "authentication") == "anonymous")) 1148 or config.get(host, "authentication") == "anonymous"))
1149 and not x509_verify_identity(host, "_xmpp-client", cert) then 1149 and not x509_verify_identity(host, "_xmpp-server", cert) then
1150 print(" Not vaild for server-to-server connections to "..host..".") 1150 print(" Not vaild for server-to-server connections to "..host..".")
1151 cert_ok = false 1151 cert_ok = false
1152 end 1152 end
1153 end 1153 end
1154 end 1154 end