aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-17 14:55:57 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-17 14:55:57 +0100
commit45e58c98b5e4602efaf1d24ec6d23d07d67b006a (patch)
tree798d91bc5bd12ffb951acbff2ef3e49e9eaf383f
parent3d22661def97ba52851d798e6795fd8f2460b61e (diff)
downloadprosody-45e58c98b5e4602efaf1d24ec6d23d07d67b006a.tar.gz
prosody-45e58c98b5e4602efaf1d24ec6d23d07d67b006a.zip
prosodyctl: check dns: More concise output (merged separate v4/v6 warnings)
-rwxr-xr-xprosodyctl13
1 files changed, 9 insertions, 4 deletions
diff --git a/prosodyctl b/prosodyctl
index 11c6296b..e0114e3a 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -937,12 +937,17 @@ function commands.check(arg)
end
end
+ local bad_protos = {}
if not host_ok_v4 then
- print(" Host "..host.." does not seem to resolve to this server for IPv4");
+ table.insert(bad_protos, "IPv4");
end
- if not host_ok_v6 and v6_supported then
- print(" Host "..host.." does not seem to resolve to this server for IPv6");
- elseif host_ok_v6 and not v6_supported then
+ if not host_ok_v6 then
+ table.insert(bad_protos, "IPv6");
+ end
+ if #bad_protos > 0 then
+ print(" Host "..host.." does not seem to resolve to this server ("..table.concat(bad_protos, "/")..")");
+ end
+ if host_ok_v6 and not v6_supported then
print(" Host "..host.." has AAAA records, but your version of LuaSocket does not support IPv6.");
print(" Please see http://prosody.im/doc/ipv6 for more information.");
end