aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-09-18 17:08:31 +0200
committerKim Alvefur <zash@zash.se>2017-09-18 17:08:31 +0200
commit027e7a5b81e443487b897c29f9e1f51f12aba445 (patch)
tree5ab6716fe5b4911ab8f3f5578e291f8598a00cc6
parente49577528abf2b24b5c334ade8c2ef9ae05b3cb7 (diff)
downloadprosody-027e7a5b81e443487b897c29f9e1f51f12aba445.tar.gz
prosody-027e7a5b81e443487b897c29f9e1f51f12aba445.zip
prosodyctl: Only demand a hostname argument to cert commands other than import
-rwxr-xr-xprosodyctl16
1 files changed, 9 insertions, 7 deletions
diff --git a/prosodyctl b/prosodyctl
index 353253ec..74bb2ad8 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -939,13 +939,15 @@ function commands.cert(arg)
end
local subcmd = table.remove(arg, 1);
if type(cert_commands[subcmd]) == "function" then
- if not arg[1] then
- show_message"You need to supply at least one hostname"
- arg = { "--help" };
- end
- if arg[1] ~= "--help" and not hosts[arg[1]] then
- show_message(error_messages["no-such-host"]);
- return 1;
+ if subcmd ~= "import" then -- hostnames are optional for import
+ if not arg[1] then
+ show_message"You need to supply at least one hostname"
+ arg = { "--help" };
+ end
+ if arg[1] ~= "--help" and not hosts[arg[1]] then
+ show_message(error_messages["no-such-host"]);
+ return 1;
+ end
end
return cert_commands[subcmd](arg);
elseif subcmd == "check" then