From: Miod Vallat <miod.vallat@powerdns.com>
Date: Thu, 3 Jul 2025 10:48:52 +0000 (+0200)
Subject: Also remove NSEC3 record pairs when removing ENT.
X-Git-Tag: rec-5.3.0-alpha2~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a8a5c7629984e51b717494a23c0c6651de0b030;p=thirdparty%2Fpdns.git

Also remove NSEC3 record pairs when removing ENT.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>
---

diff --git a/modules/lmdbbackend/lmdbbackend.cc b/modules/lmdbbackend/lmdbbackend.cc
index 737dcca2da..e305792df3 100644
--- a/modules/lmdbbackend/lmdbbackend.cc
+++ b/modules/lmdbbackend/lmdbbackend.cc
@@ -2808,14 +2808,16 @@ bool LMDBBackend::updateEmptyNonTerminals(domainid_t domain_id, set<DNSName>& in
 
       std::string ser = serializeToBuffer(lrr);
 
-      txn->txn->put(txn->db->dbi, co(domain_id, lrr.qname, 0), ser);
+      txn->txn->put(txn->db->dbi, co(domain_id, lrr.qname, QType::ENT), ser);
 
       // cout <<" +"<<n<<endl;
     }
     for (auto n : erase) {
       // cout <<" -"<<n<<endl;
       n.makeUsRelative(di.zone);
-      txn->txn->del(txn->db->dbi, co(domain_id, n, 0));
+      // Remove possible NSEC3 record pair tied to that ENT.
+      deleteNSEC3RecordPair(txn, domain_id, n);
+      txn->txn->del(txn->db->dbi, co(domain_id, n, QType::ENT));
     }
   }
   if (needCommit)