Changeset

13842:31fa834108bc

Merge 13.0->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 10 Apr 2025 11:33:47 +0100
parents 13839:8b1299eccce6 (current diff) 13841:d01cfbb7fc4f (diff)
children 13844:bb15cbb856a1
files
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
 
--- 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