Merge 13.0->trunk

2 files changed, 16 insertions, 0 deletions

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 6c6b670b..fc475b6b 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -227,7 +227,17 @@ do
 								host = env.__currenthost or "*";
 								option_name = k;
 							}, config_option_proxy_mt);
+						elseif val == nil then
+							t_insert(
+								warnings,
+								("%s: %d: unrecognized value: %s (you may be missing quotes around it)"):format(
+									config_file,
+									get_line_number(config_file),
+									k
+								)
+							);
 						end
+
 						return val;
 					end
 
diff --git a/util/prosodyctl/check.lua b/util/prosodyctl/check.lua
index c46755af..9d3c3cb9 100644
--- a/util/prosodyctl/check.lua
+++ b/util/prosodyctl/check.lua
@@ -643,6 +643,12 @@ local function check(arg)
 			print("    mod_posix is loaded in your configuration file, but it has");
 			print("    been deprecated. You can safely remove it.");
 		end
+		if all_modules:contains("admin_telnet") then
+			print("");
+			print("    mod_admin_telnet is being replaced by mod_admin_shell (prosodyctl shell).");
+			print("    To update and ensure all commands are available, simply change \"admin_telnet\" to \"admin_shell\"");
+			print("    in your modules_enabled list.");
+		end
 
 		local load_failures = {};
 		for mod_name in all_modules do