aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-25 15:40:35 +0100
committerKim Alvefur <zash@zash.se>2016-02-25 15:40:35 +0100
commita50400a3c22434805b4220379070b09930639063 (patch)
tree510af1472114eea8f6d102eddf1506f3b8b7dcfa /util
parent85fba1e8697d6fb0508303d866181b8b277f05d6 (diff)
parent05db1004dc198727112080224c97cb586760ab1d (diff)
downloadprosody-a50400a3c22434805b4220379070b09930639063.tar.gz
prosody-a50400a3c22434805b4220379070b09930639063.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/openssl.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/util/openssl.lua b/util/openssl.lua
index 12e49eac..757259f6 100644
--- a/util/openssl.lua
+++ b/util/openssl.lua
@@ -70,8 +70,7 @@ function ssl_config:serialize()
end
end
elseif k == "distinguished_name" then
- for i=1, #DN_order do
- local k = DN_order[i]
+ for i, k in ipairs(t[1] and t or DN_order) do
local v = t[k];
if v then
s = s .. ("%s = %s\n"):format(k, v);