Report KSK's that are missing from DS/DLV RRset

diff --git a/contrib/dnssec/checkds.py b/contrib/dnssec/checkds.py
index d4603a428499265fb5fd32a4ed8552b051516953..4a23385eefe73b7bdd5e2b030d0282af630807a1 100644 (file)
--- a/contrib/dnssec/checkds.py
+++ b/contrib/dnssec/checkds.py
@@ -170,9 +170,9 @@ def checkds(zone, masterfile = None):
                    (ds.rrname.strip('.'), ds.keyalg,
                     ds.keyid, DSRR.hashalgs[ds.hashalg]))
             found = True
-
-    if not found:
-        print ("No DS records found covering %s/DNSKEY" % zone)
+        else:
+            print ("No DS records found for KSK %s/%03d/%05d" %
+                   (ds.rrname, ds.keyalg, ds.keyid))
 
     return found
 
@@ -216,9 +216,9 @@ def checkdlv(zone, lookaside, masterfile = None):
                    (dlv.parent, dlv.keyalg, dlv.keyid,
                     DLVRR.hashalgs[dlv.hashalg], dlv.dlvname))
             found = True
-
-    if not found:
-        print ("No DLV records found covering %s/DNSKEY" % zone)
+        else:
+            print ("No DLV records found for KSK %s/%03d/%05d in %s" %
+                   (dlv.parent, dlv.keyalg, dlv.keyid, dlv.dlvname))
 
     return found
 

diff --git a/contrib/dnssec/tests/tests.sh b/contrib/dnssec/tests/tests.sh
index 27bd947221d6318e4c3b20c71b232562f794a1d8..af090b29e54f8fec236c790610dab621f2aa75a0 100644 (file)
--- a/contrib/dnssec/tests/tests.sh
+++ b/contrib/dnssec/tests/tests.sh
@@ -100,7 +100,7 @@ ret=0
 $CHECKDS missing.example > checkds.out.$n || ret=1
 grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
 grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'DS missing' checkds.out.$n > /dev/null 2>&1 || ret=1
+grep 'No DS' checkds.out.$n > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -110,7 +110,7 @@ ret=0
 $CHECKDS -f missing.example.dnskey.db missing.example > checkds.out.$n || ret=1
 grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
 grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'DS missing' checkds.out.$n > /dev/null 2>&1 || ret=1
+grep 'No DS' checkds.out.$n > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -120,7 +120,7 @@ ret=0
 $CHECKDS -l dlv.example missing.example > checkds.out.$n || ret=1
 grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
 grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'DS missing' checkds.out.$n > /dev/null 2>&1 || ret=1
+grep 'No DLV' checkds.out.$n > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -130,7 +130,7 @@ ret=0
 $CHECKDS -l dlv.example -f missing.example.dnskey.db missing.example > checkds.out.$n || ret=1
 grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
 grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'DS missing' checkds.out.$n > /dev/null 2>&1 || ret=1
+grep 'No DLV' checkds.out.$n > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`