3628. [func] Report DNSKEY key id's when dumping the cache.

                        [RT #34533]

diff --git a/CHANGES b/CHANGES
index 272cfa726fb5587e34df88a5225608e1b70604d1..809748baa77d93b4a85b3701fb09695c8165eb77 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3628.  [func]          Report DNSKEY key id's when dumping the cache.
+                       [RT #34533]
+
 3627.  [bug]           RPZ changes were not effective on slaves. [RT #34450]
 
 3626.  [func]          dig: NSID output now easier to read. [RT #21160]

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 839ff61666f4cb43a43c1fcca0a4d4c62f98f2b9..1e92dd20a40ac89369077db969b25589af91700a 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -2273,5 +2273,14 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
 
+echo "I:check that key id are logged when dumping the cache ($n)"
+ret=0
+$RNDC -c ../common/rndc.conf -s 10.53.0.4 -p 9953 dumpdb 2>&1 | sed 's/^/I:ns1 /'
+sleep 1
+grep "; key id = " ns4/named_dump.db > /dev/null || ret=1
+n=`expr $n + 1`
+if [ $ret != 0 ]; then echo "I:failed"; fi
+status=`expr $status + $ret`
+
 echo "I:exit status: $status"
 exit $status

diff --git a/lib/dns/masterdump.c b/lib/dns/masterdump.c
index 033da213b452655eedad8ddebe7de2efd35a4712..5fb06747aa3e2b037c652a9f4a33608bc6b687d2 100644 (file)
--- a/lib/dns/masterdump.c
+++ b/lib/dns/masterdump.c
@@ -138,6 +138,7 @@ dns_master_style_cache = {
        DNS_STYLEFLAG_OMIT_OWNER |
        DNS_STYLEFLAG_OMIT_CLASS |
        DNS_STYLEFLAG_MULTILINE |
+       DNS_STYLEFLAG_RRCOMMENT |
        DNS_STYLEFLAG_TRUST |
        DNS_STYLEFLAG_NCACHE,
        24, 32, 32, 40, 80, 8, UINT_MAX