diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:26:51 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-09-27 12:26:51 +0100 |
| commit | adca883cc39dee260fa778406a16e42169929157 (patch) | |
| tree | 6ee31eed4313315570c0313efa6fc664e02c3aea /core | |
| parent | 23d676ee18f898b0db00358a1679bf8e56ef043b (diff) | |
| parent | 0adb8201b5befee459eed2c0388d3c035a831ca1 (diff) | |
| download | prosody-adca883cc39dee260fa778406a16e42169929157.tar.gz prosody-adca883cc39dee260fa778406a16e42169929157.zip | |
Merge with 0.5
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 118bbf0c..daf2c871 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -255,20 +255,20 @@ function try_connect(host_session, connect_host, connect_port) host_session.connecting = nil; -- COMPAT: This is a compromise for all you CNAME-(ab)users :) - if not (reply and reply[1] and reply[1].a) then + 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[1] and not reply[1].a and reply[1].cname do - log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[1].cname), count); - reply = dns.peek(reply[1].cname, "A", "IN") or dns.peek(reply[1].cname, "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[1] and reply[1].a then - log("debug", "DNS reply for %s gives us %s", connect_host, reply[1].a); - return make_connect(host_session, reply[1].a, connect_port); + if reply and reply[#reply] and reply[#reply].a then + log("debug", "DNS reply for %s gives us %s", connect_host, reply[#reply].a); + return make_connect(host_session, reply[#reply].a, connect_port); else log("debug", "DNS lookup failed to get a response for %s", connect_host); if not attempt_connection(host_session, "name resolution failed") then -- Retry if we can |