From 0e5b00dac9bd842bb5890c6e0e722c5669ca7a4a Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 1 Sep 2020 16:00:40 +0200 Subject: [PATCH] Revert "Added support for cname records on looking op srv records" This reverts commit 80a2b032bcac2b1a64edbbea6cec97c4ae024d7e. --- app/src/main/java/eu/faircode/email/DnsHelper.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DnsHelper.java b/app/src/main/java/eu/faircode/email/DnsHelper.java index b35ba229db..2f647244fb 100644 --- a/app/src/main/java/eu/faircode/email/DnsHelper.java +++ b/app/src/main/java/eu/faircode/email/DnsHelper.java @@ -28,7 +28,6 @@ import android.os.Build; import androidx.annotation.NonNull; -import org.xbill.DNS.CNAMERecord; import org.xbill.DNS.Lookup; import org.xbill.DNS.MXRecord; import org.xbill.DNS.Record; @@ -103,11 +102,6 @@ public class DnsHelper { @NonNull static DnsRecord[] lookup(Context context, String name, String type) throws UnknownHostException { - return _lookup(context, name, type, 0); - } - - @NonNull - static DnsRecord[] _lookup(Context context, String name, String type, int redirects) throws UnknownHostException { int rtype; switch (type) { case "mx": @@ -145,11 +139,6 @@ public class DnsHelper { } else if (record instanceof SRVRecord) { SRVRecord srv = (SRVRecord) record; result.add(new DnsRecord(srv.getTarget().toString(true), srv.getPort())); - } else if (record instanceof CNAMERecord) { - if (++redirects > 3) - throw new UnknownHostException("Too many cname records"); - CNAMERecord cname = (CNAMERecord) record; - return _lookup(context, cname.getTarget().toString(true), type, redirects); } else throw new IllegalArgumentException(record.getClass().getName()); }