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

Merge 0.10 -> trunk

Browse source
This commit is contained in:
Matthew Wild 2016-07-28 09:39:50 +01:00
commit d6780dd7ed
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/dns.lua
View file

@ -22,8 +22,8 @@ local is_windows = (_ and windows) or os.getenv("WINDIR");
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, ...)

3
prosodyctl
View file

@ -268,7 +268,6 @@ end
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 @@ function commands.about(arg)
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 @@ function cert_commands.generate(arg)
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

8
util/openssl.lua
View file

@ -61,15 +61,15 @@ local DN_order = {
_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