aboutsummaryrefslogtreecommitdiffstats
path: root/util
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 /util
parenta12109bf85c36060767fb57446ea7c8b13b3afa7 (diff)
parentadd57bd7f62cd2ff4c5b5b72bceef0f74f8b1626 (diff)
downloadprosody-d6780dd7edf90f052074613505fd5917e76b72e6.tar.gz
prosody-d6780dd7edf90f052074613505fd5917e76b72e6.zip
Merge 0.10 -> trunk
Diffstat (limited to 'util')
-rw-r--r--util/openssl.lua8
1 files changed, 4 insertions, 4 deletions
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