Software / code / prosody
Comparison
prosodyctl @ 5024:d25e1b9332cc
Merge with Florob
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 28 Jul 2012 01:14:31 +0100 |
| parent | 5023:dcc8e789df36 |
| parent | 4935:bc62abceef07 |
| child | 5101:a94c43cad081 |
comparison
equal
deleted
inserted
replaced
| 5023:dcc8e789df36 | 5024:d25e1b9332cc |
|---|---|
| 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 |