diff options
| author | Kim Alvefur <zash@zash.se> | 2015-04-26 00:06:44 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-04-26 00:06:44 +0200 |
| commit | 3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000 (patch) | |
| tree | 11f81ddc7bcc089676e965ba2b9171c2767911d5 /plugins | |
| parent | 48652fb9d3b1eeb4dc44460abf3ba2060cf5bb91 (diff) | |
| parent | 7dff400ed5e217b3316b9b311b41c826d10e67f1 (diff) | |
| download | prosody-3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000.tar.gz prosody-3e6b35b5d49b5f6ec06cb301ba7b4cbce0a75000.zip | |
Merge 0.9->0.10
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 942a618d..5214f4cf 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); |