prosody
f82356adcd71
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 7494:f82356adcd71

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Jul 2016 10:25:52 +0200
parent 7456:76a8456cf1e2
parent 7483:8c5320a4bfaf
child 7530:f14094d10925
comparison
equal deleted inserted replaced
7488:cdabf8199903 7494:f82356adcd71
715 end 715 end
716 conf.distinguished_name = dn; 716 conf.distinguished_name = dn;
717 else 717 else
718 show_message("Please provide details to include in the certificate config file."); 718 show_message("Please provide details to include in the certificate config file.");
719 show_message("Leave the field empty to use the default value or '.' to exclude the field.") 719 show_message("Leave the field empty to use the default value or '.' to exclude the field.")
720 for i, k in ipairs(openssl._DN_order) do 720 for _, k in ipairs(openssl._DN_order) do
721 local v = conf.distinguished_name[k]; 721 local v = conf.distinguished_name[k];
722 if v then 722 if v then
723 local nv; 723 local nv;
724 if k == "commonName" then 724 if k == "commonName" then
725 v = arg[1] 725 v = arg[1]