From: Otto <otto.moerbeek@open-xchange.com>
Date: Thu, 14 Oct 2021 10:30:25 +0000 (+0200)
Subject: Fix rebase botch that partially undid PR #10797
X-Git-Tag: dnsdist-1.7.0-alpha2~9^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e67810005a1f6aac2d5071a394ac9bff5e38af18;p=thirdparty%2Fpdns.git

Fix rebase botch that partially undid PR #10797
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 72aa66aa02..a221e6b67a 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2267,8 +2267,12 @@ static void startDoResolve(void *p)
     }
 
     if (!SyncRes::s_nopacketcache && !variableAnswer && !sr.wasVariable()) {
-      minTTL = min(minTTL, pw.getHeader()->rcode == RCode::ServFail ? SyncRes::s_packetcacheservfailttl :
-                   SyncRes::s_packetcachettl);
+      const auto& hdr = pw.getHeader();
+      if ((hdr->rcode != RCode::NoError && hdr->rcode != RCode::NXDomain) ||
+          (hdr->ancount == 0 && hdr->nscount == 0)) {
+        minTTL = min(minTTL, SyncRes::s_packetcacheservfailttl);
+      }
+      minTTL = min(minTTL, SyncRes::s_packetcachettl);
       t_packetCache->insertResponsePacket(dc->d_tag, dc->d_qhash, std::move(dc->d_query), dc->d_mdp.d_qname,
                                           dc->d_mdp.d_qtype, dc->d_mdp.d_qclass,
                                           string((const char*)&*packet.begin(), packet.size()),
@@ -2341,7 +2345,7 @@ static void startDoResolve(void *p)
         }
       }
 #endif /* NOD_ENABLED */
-      if (SyncRes::s_event_trace_enabled & SyncRes::event_trace_to_pb) {
+      if (sr.d_eventTrace.enabled() && SyncRes::s_event_trace_enabled & SyncRes::event_trace_to_pb) {
         pbMessage.addEvents(sr.d_eventTrace);
       }
       if (dc->d_logResponse) {