Don't allow DNSSEC records in the raw zone

There was an exception for dnssec-policy that allowed DNSSEC in the
unsigned version of the zone. This however causes a crash if the
zone switches from dynamic to inline-signing in the case of NSEC3,
because we are now trying to add an NSEC3 record to a non-NSEC3 node.
This is because BIND expects none of the records in the unsigned
version of the zone to be NSEC3.

Remove the exception for dnssec-policy when copying non DNSSEC
records, but do allow for DNSKEY as this may be a published DNSKEY
from a different provider.

(cherry picked from commit 332b98ae49948e26a90f1d6e0a625f6eec568777)

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3f9e1f8ae7f186d6a3344c1523aae7459f618b8a..90f3b10f8f4ea81b00248b19d6bb095f70dd31c8 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -17246,9 +17246,8 @@ restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version,
 }
 
 static isc_result_t
-copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version,
-                       dns_db_t *rawdb, dns_dbiterator_t *dbiterator,
-                       unsigned int *oldserial) {
+copy_non_dnssec_records(dns_db_t *db, dns_db_t *version, dns_db_t *rawdb,
+                       dns_dbiterator_t *dbiterator, unsigned int *oldserial) {
        dns_dbnode_t *rawnode = NULL, *node = NULL;
        dns_fixedname_t fixed;
        dns_name_t *name = dns_fixedname_initname(&fixed);
@@ -17285,14 +17284,8 @@ copy_non_dnssec_records(dns_zone_t *zone, dns_db_t *db, dns_db_t *version,
                    rdataset.type == dns_rdatatype_dnskey ||
                    rdataset.type == dns_rdatatype_nsec3param)
                {
-                       /*
-                        * Allow DNSSEC records with dnssec-policy.
-                        * WMM: Perhaps add config option for it.
-                        */
-                       if (dns_zone_getkasp(zone) == NULL) {
-                               dns_rdataset_disassociate(&rdataset);
-                               continue;
-                       }
+                       dns_rdataset_disassociate(&rdataset);
+                       continue;
                }
                if (rdataset.type == dns_rdatatype_soa && oldserial != NULL) {
                        result = checkandaddsoa(db, node, version, &rdataset,
@@ -17395,8 +17388,8 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) {
        for (result = dns_dbiterator_first(dbiterator); result == ISC_R_SUCCESS;
             result = dns_dbiterator_next(dbiterator))
        {
-               result = copy_non_dnssec_records(zone, db, version, rawdb,
-                                                dbiterator, oldserialp);
+               result = copy_non_dnssec_records(db, version, rawdb, dbiterator,
+                                                oldserialp);
                if (result != ISC_R_SUCCESS) {
                        goto failure;
                }