From 159b1242bab07c12620b9c40d3726b752ba0e32e Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 23 Oct 2019 15:18:08 +0200
Subject: [PATCH] Also call primeRootNSZones() from syncres (after
 primeHints())

---
 pdns/recursordist/test-syncres_cc.cc | 4 ++++
 pdns/syncres.cc                      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc
index d741978078..46ee34258a 100644
--- a/pdns/recursordist/test-syncres_cc.cc
+++ b/pdns/recursordist/test-syncres_cc.cc
@@ -27,6 +27,10 @@ int getMTaskerTID()
   return 0;
 }
 
+void primeRootNSZones(bool)
+{
+}
+
 bool RecursorLua4::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, bool isTcp, vector<DNSRecord>& res, int& ret) const
 {
   return false;
diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 8419150aa1..ae18dd8abe 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1025,6 +1025,7 @@ void SyncRes::getBestNSFromCache(const DNSName &qname, const QType& qtype, vecto
     if(subdomain.isRoot() && !brokeloop) {
       // We lost the root NS records
       primeHints();
+      primeRootNSZones(g_dnssecmode != DNSSECMode::Off);
       LOG(prefix<<qname<<": reprimed the root"<<endl);
       /* let's prevent an infinite loop */
       if (!d_updatingRootNS) {
-- 
2.47.3