# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1530176700 -7200
# Node ID 3be8799263f35ac692c58848aa932cb79cfd8271
# Parent  3a095233e1782361404432a9cbe654805c45b155# Parent  f12cc1d7aa653ae49b6d178a8b07603f8262cd61
Merge 0.10->trunk

diff -r 3a095233e178 -r 3be8799263f3 prosodyctl
--- a/prosodyctl	Thu Jun 28 01:46:28 2018 +0200
+++ b/prosodyctl	Thu Jun 28 11:05:00 2018 +0200
@@ -779,6 +779,10 @@
 	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