Comparison

prosodyctl @ 4940:39781d4d3173

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 05 Jul 2012 17:40:12 +0100
parent 4935:bc62abceef07
child 5024:d25e1b9332cc
comparison
equal deleted inserted replaced
4932:212e81ac6ebb 4940:39781d4d3173
686 return nil, key_filename; 686 return nil, key_filename;
687 end 687 end
688 show_message("There was a problem, see OpenSSL output"); 688 show_message("There was a problem, see OpenSSL output");
689 else 689 else
690 show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n " 690 show_usage("cert key HOSTNAME <bits>", "Generates a RSA key named HOSTNAME.key\n "
691 .."Promps for a key size if none given") 691 .."Prompts for a key size if none given")
692 end 692 end
693 end 693 end
694 694
695 function cert_commands.request(arg) 695 function cert_commands.request(arg)
696 if #arg >= 1 and arg[1] ~= "--help" then 696 if #arg >= 1 and arg[1] ~= "--help" then