mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-05-30 13:17:28 +02:00
commit fcca840db8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
prosodyctl
View file

@ -1261,13 +1261,13 @@ function commands.check(arg)
end end
if config.get(host, "component_module") == nil if config.get(host, "component_module") == nil
and not x509_verify_identity(host, "_xmpp-client", cert) then and not x509_verify_identity(host, "_xmpp-client", cert) then
print(" Not vaild for client connections to "..host..".") print(" Not valid for client connections to "..host..".")
cert_ok = false cert_ok = false
end end
if (not (config.get(host, "anonymous_login") if (not (config.get(host, "anonymous_login")
or config.get(host, "authentication") == "anonymous")) or config.get(host, "authentication") == "anonymous"))
and not x509_verify_identity(host, "_xmpp-server", cert) then and not x509_verify_identity(host, "_xmpp-server", cert) then
print(" Not vaild for server-to-server connections to "..host..".") print(" Not valid for server-to-server connections to "..host..".")
cert_ok = false cert_ok = false
end end
end end

2
util/dataforms.lua
View file

@ -72,7 +72,7 @@ function form_t.form(layout, data, formtype)
for _, val in ipairs(field.options or value) do for _, val in ipairs(field.options or value) do
if type(val) == "table" then if type(val) == "table" then
form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up(); form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
if value == val.value or field.options and val.default and (not has_default) then if value == val.value or val.default and (not has_default) then
form:tag("value"):text(val.value):up(); form:tag("value"):text(val.value):up();
has_default = true; has_default = true;
end end