Diff

plugins/mod_s2s/s2sout.lib.lua @ 6632:855085439f7f

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Sun, 26 Apr 2015 00:06:44 +0200
parent 6256:d05627c89c99
parent 6631:45222bfb206f
child 6685:3f05b255937f
line wrap: on
line diff
--- a/plugins/mod_s2s/s2sout.lib.lua	Sun Apr 26 00:06:11 2015 +0200
+++ b/plugins/mod_s2s/s2sout.lib.lua	Sun Apr 26 00:06:44 2015 +0200
@@ -169,18 +169,6 @@
 			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);