Merge 0.10->trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/prosodyctl b/prosodyctl
index 70d6f386..8f1f6b5d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -779,6 +779,10 @@ function commands.check(arg)
 	local ok = true;
 	local function disabled_hosts(host, conf) return host ~= "*" and conf.enabled ~= false; end
 	local function enabled_hosts() return it.filter(disabled_hosts, pairs(configmanager.getconfig())); end
+	if not (what == nil or what == "disabled" or what == "config" or what == "dns" or what == "certs") then
+		show_warning("Don't know how to check '%s'. Try one of 'config', 'dns', 'certs' or 'disabled'.", what);
+		return 1;
+	end
 	if not what or what == "disabled" then
 		local disabled_hosts_set = set.new();
 		for host, host_options in it.filter("*", pairs(configmanager.getconfig())) do