aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
committerMatthew Wild <mwild1@gmail.com>2016-07-28 09:39:50 +0100
commitd6780dd7edf90f052074613505fd5917e76b72e6 (patch)
treec1767a4b6577725fbe5586acab5a2453c18b373a
parenta12109bf85c36060767fb57446ea7c8b13b3afa7 (diff)
parentadd57bd7f62cd2ff4c5b5b72bceef0f74f8b1626 (diff)
downloadprosody-d6780dd7edf90f052074613505fd5917e76b72e6.tar.gz
prosody-d6780dd7edf90f052074613505fd5917e76b72e6.zip
Merge 0.10 -> trunk
-rw-r--r--net/dns.lua4
-rwxr-xr-xprosodyctl3
-rw-r--r--util/openssl.lua8
3 files changed, 6 insertions, 9 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 7bdb9e57..232e9e7c 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -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, ...)
diff --git a/prosodyctl b/prosodyctl
index 74681e7c..2115bc65 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -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
diff --git a/util/openssl.lua b/util/openssl.lua
index abd90a84..703c6d15 100644
--- a/util/openssl.lua
+++ b/util/openssl.lua
@@ -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