aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_s2s
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-24 14:14:01 +0200
committerKim Alvefur <zash@zash.se>2015-04-24 14:14:01 +0200
commit1626e0537bc7823f6f3521e9cdfcce4f2ffc017a (patch)
treeaaeae7aab9070d0eb7402fdd5eb20d597c842737 /plugins/mod_s2s
parent707bec51fe9cce2db777ac118c3f2d93b3ca332d (diff)
downloadprosody-1626e0537bc7823f6f3521e9cdfcce4f2ffc017a.tar.gz
prosody-1626e0537bc7823f6f3521e9cdfcce4f2ffc017a.zip
net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s
Diffstat (limited to 'plugins/mod_s2s')
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua12
1 files changed, 0 insertions, 12 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index b24faf85..67b8fd0f 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -169,18 +169,6 @@ function s2sout.try_connect(host_session, connect_host, connect_port, err)
handle4 = adns.lookup(function (reply, err)
handle4 = nil;
- -- COMPAT: This is a compromise for all you CNAME-(ab)users :)
- if not (reply and reply[#reply] and reply[#reply].a) then
- local count = max_dns_depth;
- reply = dns.peek(connect_host, "CNAME", "IN");
- while count > 0 and reply and reply[#reply] and not reply[#reply].a and reply[#reply].cname do
- log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[#reply].cname), count);
- reply = dns.peek(reply[#reply].cname, "A", "IN") or dns.peek(reply[#reply].cname, "CNAME", "IN");
- count = count - 1;
- end
- end
- -- end of CNAME resolving
-
if reply and reply[#reply] and reply[#reply].a then
for _, ip in ipairs(reply) do
log("debug", "DNS reply for %s gives us %s", connect_host, ip.a);