Diff

prosodyctl @ 10270:c2b9ff42db03

Merge 0.11->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Sep 2019 16:50:29 +0200
parent 10210:9fdda9fafc3c
parent 10257:26afb1a6d086
child 10369:9d20fca6a485
line wrap: on
line diff
--- a/prosodyctl	Thu Sep 19 22:53:00 2019 +0200
+++ b/prosodyctl	Sat Sep 21 16:50:29 2019 +0200
@@ -1142,17 +1142,21 @@
 
 			if modules:contains("proxy65") then
 				local proxy65_target = configmanager.get(host, "proxy65_address") or host;
-				local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA");
-				local prob = {};
-				if not A then
-					table.insert(prob, "A");
-				end
-				if v6_supported and not AAAA then
-					table.insert(prob, "AAAA");
-				end
-				if #prob > 0 then
-					print("    File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/")
-					.." record. Create one or set 'proxy65_address' to the correct host/IP.");
+				if type(proxy65_target) == "string" then
+					local A, AAAA = dns.lookup(idna.to_ascii(proxy65_target), "A"), dns.lookup(idna.to_ascii(proxy65_target), "AAAA");
+					local prob = {};
+					if not A then
+						table.insert(prob, "A");
+					end
+					if v6_supported and not AAAA then
+						table.insert(prob, "AAAA");
+					end
+					if #prob > 0 then
+						print("    File transfer proxy "..proxy65_target.." has no "..table.concat(prob, "/")
+						.." record. Create one or set 'proxy65_address' to the correct host/IP.");
+					end
+				else
+					print("    proxy65_address for "..host.." should be set to a string, unable to perform DNS check");
 				end
 			end