From 16bd30ae6987cd4ba4fe3b873e72abf5b7178c26 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 12 Aug 2013 14:38:26 +1000
Subject: [PATCH] 3628.   [func]          Report DNSKEY key id's when dumping
 the cache.                         [RT #34533]

---
 CHANGES                          | 3 +++
 bin/tests/system/dnssec/tests.sh | 9 +++++++++
 lib/dns/masterdump.c             | 1 +
 3 files changed, 13 insertions(+)

diff --git a/CHANGES b/CHANGES
index 272cfa726f..809748baa7 100644
--- 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 839ff61666..1e92dd20a4 100644
--- 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 033da213b4..5fb06747aa 100644
--- 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