Software / code / prosody
Changeset
7447:843fe134453e
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 30 May 2016 13:17:28 +0200 |
| parents | 7444:45d28235ebe0 (current diff) 7446:0db72fac2faa (diff) |
| children | 7450:3ae19750cd46 |
| files | prosodyctl |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Sat May 28 12:51:12 2016 +0200 +++ b/prosodyctl Mon May 30 13:17:28 2016 +0200 @@ -1261,13 +1261,13 @@ end if config.get(host, "component_module") == nil 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 end if (not (config.get(host, "anonymous_login") or config.get(host, "authentication") == "anonymous")) 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 end end
--- a/util/dataforms.lua Sat May 28 12:51:12 2016 +0200 +++ b/util/dataforms.lua Mon May 30 13:17:28 2016 +0200 @@ -72,7 +72,7 @@ for _, val in ipairs(field.options or value) do if type(val) == "table" then 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(); has_default = true; end
