diff --git a/CHANGES b/CHANGES index 4166a91219..92b6102e1a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +6083. [bug] Fix DNSRPS-enabled builds as they were inadvertently + broken by change 6042. [GL #3827] + 6082. [test] fuzz/dns_message_checksig leaked memory when shutting down. [GL #3828] diff --git a/configure.ac b/configure.ac index b79f776eed..45faacebcd 100644 --- a/configure.ac +++ b/configure.ac @@ -1463,10 +1463,7 @@ AC_COMPILE_IFELSE( AC_MSG_RESULT([no]) ]) -# DNSRPS is not included in pairwise testing as the librpz library is not -# present in the relevant Docker image. -# -# [pairwise: skip] +# [pairwise: --enable-dnsrps --enable-dnsrps-dl, --disable-dnsrps] AC_ARG_ENABLE([dnsrps-dl], [AS_HELP_STRING([--enable-dnsrps-dl], [DNS Response Policy Service delayed link diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c index 0a82059d02..d4a1c65e7f 100644 --- a/lib/dns/dnsrps.c +++ b/lib/dns/dnsrps.c @@ -622,7 +622,8 @@ rpsdb_finddb(dns_db_t *db, const dns_name_t *name, dns_dbversion_t *version, static isc_result_t rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, - isc_stdtime_t now, dns_rdatasetiter_t **iteratorp) { + unsigned int options, isc_stdtime_t now, + dns_rdatasetiter_t **iteratorp) { rpsdb_t *rpsdb = (rpsdb_t *)db; rpsdb_rdatasetiter_t *rpsdb_iter; @@ -638,6 +639,7 @@ rpsdb_allrdatasets(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version, rpsdb_iter->common.magic = DNS_RDATASETITER_MAGIC; rpsdb_iter->common.methods = &rpsdb_rdatasetiter_methods; rpsdb_iter->common.db = db; + rpsdb_iter->common.options = options; rpsdb_attachnode(db, node, &rpsdb_iter->common.node); *iteratorp = &rpsdb_iter->common;