# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1744281227 -3600
# Node ID 31fa834108bc5d2bf3112a3c0cc2dcc6cf7b1f08
# Parent  8b1299eccce6bd66838e2cde0efa1df9ec0aefae# Parent  d01cfbb7fc4ff26a9f11b2ffcd5787ae08608bb3
Merge 13.0->trunk

diff -r 8b1299eccce6 -r 31fa834108bc core/configmanager.lua
--- a/core/configmanager.lua	Thu Apr 10 00:23:22 2025 +0200
+++ b/core/configmanager.lua	Thu Apr 10 11:33:47 2025 +0100
@@ -227,7 +227,17 @@
 								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 -r 8b1299eccce6 -r 31fa834108bc util/prosodyctl/check.lua
--- a/util/prosodyctl/check.lua	Thu Apr 10 00:23:22 2025 +0200
+++ b/util/prosodyctl/check.lua	Thu Apr 10 11:33:47 2025 +0100
@@ -643,6 +643,12 @@
 			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