From aa30ad7eeeedd61708987c59d56021afa8a7ba0d Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 26 Jun 2017 17:17:08 +0200
Subject: [PATCH] rec: Compute the zone cuts before trying to validate a cached
 entry

---
 pdns/syncres.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 8dd6d0dfd..95123efdd 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -823,6 +823,9 @@ bool SyncRes::doCNAMECacheCheck(const DNSName &qname, const QType &qtype, vector
         if (validationEnabled() && wasAuth && state == Indeterminate && d_requireAuthData) {
           /* This means we couldn't figure out the state when this entry was cached,
              most likely because we hadn't computed the zone cuts yet. */
+          /* make sure they are computed before validating */
+          computeZoneCuts(qname, g_rootdnsname, depth);
+
           vState recordState = getValidationStatus(qname);
           if (recordState == Secure) {
             LOG(prefix<<qname<<": got Indeterminate state from the CNAME cache, validating.."<<endl);
@@ -977,6 +980,9 @@ bool SyncRes::doCacheCheck(const DNSName &qname, const QType &qtype, vector<DNSR
 
       /* This means we couldn't figure out the state when this entry was cached,
          most likely because we hadn't computed the zone cuts yet. */
+      /* make sure they are computed before validating */
+      computeZoneCuts(sqname, g_rootdnsname, depth);
+
       vState recordState = getValidationStatus(qname);
       if (recordState == Secure) {
         LOG(prefix<<sqname<<": got Indeterminate state from the cache, validating.."<<endl);
-- 
2.40.0