# HG changeset patch # User Emmanuel Gil Peyrot # Date 1529763336 -7200 # Node ID ddd98e2625198d86178673bd488bd29c328dd591 # Parent 47d318eeff8d80cac2dbda046a5eeb76f59a8756 prosodyctl: Only check for s2s if mod_s2s is enabled (fixes #1031) diff -r 47d318eeff8d -r ddd98e262519 prosodyctl --- a/prosodyctl Fri Jun 22 13:21:42 2018 +0100 +++ b/prosodyctl Sat Jun 23 16:15:36 2018 +0200 @@ -1028,6 +1028,11 @@ 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 @@ 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 @@ 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");