From 627cc114d258fb58e8defa32ebb59a23f5e9a6c9 Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Tue, 18 Feb 2020 22:56:03 +0100
Subject: [PATCH] happy eyeball: fix dnssec for plain ip an srv-cname

---
 src/main/java/eu/siacs/conversations/utils/Resolver.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 592d8b4a0..eb09f70a5 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -165,6 +165,7 @@ public class Resolver {
             Result result = new Result();
             result.ip = InetAddress.getByName(domain);
             result.port = port;
+            result.authenticated = true;
             return result;
         } catch (UnknownHostException e) {
             return null;
@@ -197,12 +198,13 @@ public class Resolver {
             }));
             fallbackThreads.add(new Thread(() -> {
                 try {
-                    for (CNAME cname : resolveWithFallback(record.name, CNAME.class, result.isAuthenticData()).getAnswersOrEmptySet()) {
-                        final List<Result> ipv6s = resolveIp(record, cname.name, AAAA.class, result.isAuthenticData(), directTls);
+                    ResolverResult<CNAME> cnames = resolveWithFallback(record.name, CNAME.class, result.isAuthenticData());
+                    for (CNAME cname : cnames.getAnswersOrEmptySet()) {
+                        final List<Result> ipv6s = resolveIp(record, cname.name, AAAA.class, cnames.isAuthenticData(), directTls);
                         synchronized (fallbackResults) {
                             fallbackResults.addAll(ipv6s);
                         }
-                        final List<Result> ipv4s = resolveIp(record, cname.name, A.class, result.isAuthenticData(), directTls);
+                        final List<Result> ipv4s = resolveIp(record, cname.name, A.class, cnames.isAuthenticData(), directTls);
                         synchronized (results) {
                             fallbackResults.addAll(ipv4s);
                         }