From 2a9e994c49fc329651c18234352332f68e06c121 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 3 Dec 2021 12:51:10 +0100
Subject: [PATCH] auth: prevent bind-hybrid+zone-cache, fixes #10658

---
 modules/bindbackend/bindbackend2.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 2922798a9e..c7a2a007ed 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -745,6 +745,10 @@ Bind2Backend::Bind2Backend(const string& suffix, bool loadZones)
   setArgPrefix("bind" + suffix);
   d_logprefix = "[bind" + suffix + "backend]";
   d_hybrid = mustDo("hybrid");
+  if (d_hybrid && g_zoneCache.isEnabled()) {
+    throw PDNSException("bind-hybrid and the zone cache currently interoperate badly. Please disable the zone cache or stop using bind-hybrid");
+  }
+
   d_transaction_id = 0;
   s_ignore_broken_records = mustDo("ignore-broken-records");
   d_upgradeContent = ::arg().mustDo("upgrade-unknown-types");
-- 
2.47.2