Fixing retry conditions

MichaCo · May 26, 2021 · 314f0a7 · 314f0a7
1 parent 7239fe4
commit 314f0a7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/DnsClient/LookupClient.cs b/src/DnsClient/LookupClient.cs
@@ -1564,9 +1564,13 @@ private IDnsQueryResponse ProcessResponseMessage(
                 {
                     handleError = HandleError.RetryNextServer;
                 }
+
                 // Try next server if the question isn't answered (ignoring ANY and AXFR queries)
                 else if (request.Question.QuestionType != QueryType.ANY
                    && request.Question.QuestionType != QueryType.AXFR
+                   && !((request.Question.QuestionType == QueryType.A || request.Question.QuestionType == QueryType.AAAA)
+                        && result.Answers.OfRecordType(ResourceRecordType.CNAME).Any())
+                   && !(request.Question.QuestionType == QueryType.NS && result.Authorities.Any())
                    && !result.Answers.OfRecordType((ResourceRecordType)request.Question.QuestionType).Any())
                 {
                     handleError = HandleError.RetryNextServer;