Software / code / prosody
Changeset
7530:f14094d10925
Merge 0.10 -> trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 28 Jul 2016 09:39:50 +0100 |
| parents | 7525:bad62a7f461f (current diff) 7529:bdaff978c790 (diff) |
| children | 7532:02b3ea42265b |
| files | net/server_select.lua prosodyctl |
| diffstat | 3 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/net/dns.lua Wed Jul 27 15:05:54 2016 +0100 +++ b/net/dns.lua Thu Jul 28 09:39:50 2016 +0100 @@ -22,8 +22,8 @@ local coroutine, io, math, string, table = coroutine, io, math, string, table; -local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, unpack= - ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type, table.unpack or unpack; +local ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type = + ipairs, next, pairs, print, setmetatable, tostring, assert, error, select, type; local ztact = { -- public domain 20080404 lua@ztact.com get = function(parent, ...)
--- a/prosodyctl Wed Jul 27 15:05:54 2016 +0100 +++ b/prosodyctl Thu Jul 28 09:39:50 2016 +0100 @@ -268,7 +268,6 @@ local show_message, show_warning = prosodyctl.show_message, prosodyctl.show_warning; local show_usage = prosodyctl.show_usage; -local getchar, getpass = prosodyctl.getchar, prosodyctl.getpass; local show_yesno = prosodyctl.show_yesno; local show_prompt = prosodyctl.show_prompt; local read_password = prosodyctl.read_password; @@ -547,7 +546,6 @@ print("Source directory: "..relpath(pwd, CFG_SOURCEDIR or ".")); print("Plugin directories:") print(" "..(prosody.paths.plugins:gsub("([^;]+);?", function(path) - local opath = path; path = config.resolve_relative_path(pwd, path); local hgid, hgrepo = hg.check_id(path); if not hgid and hgrepo then @@ -804,7 +802,6 @@ end local _, key_filename = cert_commands.key({arg[1]}); local _, conf_filename = cert_commands.config(arg); - local ret; if key_filename and conf_filename and cert_filename and openssl.req{new=true, x509=true, nodes=true, key=key_filename, days=365, sha256=true, utf8=true, config=conf_filename, out=cert_filename} then
--- a/util/openssl.lua Wed Jul 27 15:05:54 2016 +0100 +++ b/util/openssl.lua Thu Jul 28 09:39:50 2016 +0100 @@ -61,15 +61,15 @@ _M._DN_order = DN_order; function ssl_config:serialize() local s = ""; - for k, t in pairs(self) do - s = s .. ("[%s]\n"):format(k); - if k == "subject_alternative_name" then + for section, t in pairs(self) do + s = s .. ("[%s]\n"):format(section); + if section == "subject_alternative_name" then for san, n in pairs(t) do for i = 1, #n do s = s .. s_format("%s.%d = %s\n", san, i -1, n[i]); end end - elseif k == "distinguished_name" then + elseif section == "distinguished_name" then for _, k in ipairs(t[1] and t or DN_order) do local v = t[k]; if v then
