mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031)

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2018-06-23 16:15:36 +02:00
parent 71620cbd96
commit d5e1b39056
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
prosodyctl
View file

@ -1028,6 +1028,11 @@ function commands.check(arg)
local all_targets_ok, some_targets_ok = true, false;
local node, host = jid_split(jid);
local modules, component_module = modulemanager.get_modules_for_host(host);
if component_module then
modules:add(component_module);
end
local is_component = not not host_options.component_module;
print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
if node then
@ -1052,7 +1057,7 @@ function commands.check(arg)
end
end
end
do
if modules:contains("s2s") then
local res = dns.lookup("_xmpp-server._tcp."..idna.to_ascii(host)..".", "SRV");
if res then
for _, record in ipairs(res) do
@ -1079,12 +1084,6 @@ function commands.check(arg)
target_hosts:remove("localhost");
end
local modules, component_module = modulemanager.get_modules_for_host(host);
if component_module then
modules:add(component_module);
end
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");