Software / code / prosody
Changeset
11924:53e68227c2c0
util.prosodyctl.check: Respect use_ipv4/v6 in proxy65 check
Previously it would complain about lack of an AAAA record for
proxy65_target even in an IPv6-less environment.
Thanks to libertas for unintentionally calling attention to this.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 20 Nov 2021 17:05:32 +0100 |
| parents | 11923:bd0440c12842 |
| children | 11925:3e0d03a74285 |
| files | util/prosodyctl/check.lua |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/util/prosodyctl/check.lua Sat Nov 20 17:04:15 2021 +0100 +++ b/util/prosodyctl/check.lua Sat Nov 20 17:05:32 2021 +0100 @@ -456,6 +456,8 @@ end local v6_supported = not not socket.tcp6; + local use_ipv4 = configmanager.get("*", "use_ipv4") ~= false; + local use_ipv6 = v6_supported and configmanager.get("*", "use_ipv6") ~= false; local function trim_dns_name(n) return (n:gsub("%.$", "")); @@ -574,10 +576,10 @@ 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 + if use_ipv4 and not A then table.insert(prob, "A"); end - if v6_supported and not AAAA then + if use_ipv6 and not AAAA then table.insert(prob, "AAAA"); end if #prob > 0 then @@ -589,8 +591,6 @@ end end - local use_ipv4 = configmanager.get("*", "use_ipv4") ~= false; - local use_ipv6 = v6_supported and configmanager.get("*", "use_ipv6") ~= false; if not use_ipv4 and not use_ipv6 then print(" Both IPv6 and IPv4 are disabled, Prosody will not listen on any ports"); print(" nor be able to connect to any remote servers.");
