Add CHANGES note for [GL #2236]

(cherry picked from commit decf117eb6c34c51481e9a5fa1abef66e19054eb)

diff --git a/CHANGES b/CHANGES
index e1b80606450eeeb0cc47c096ea5e522c074a28db..c213a2ef7961366268fa00041c32103d7e239c6c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+5523.  [bug]           The initial lookup of a zone transitioning to/from
+                       the signed state could fail if the DNSKEY RRset was
+                       not found.  Subsequent lookups would succeed.
+                       [GL #2236]
+
 5518.  [bug]           Fix stub zone not transferring nameserver addresses
                        from masters configured with 'minimal-responses yes'.
                        [GL #1736]

diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index c82ea52a26464b18361225ed532ac4336251ed6e..700709bbdc87a697d553f56541affa7063de92ba 100644 (file)
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@@ -12,6 +12,20 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+if test -n "$PYTHON"
+then
+    if $PYTHON -c "import dns" 2> /dev/null
+    then
+        :
+    else
+        echo_i "This test requires the dnspython module." >&2
+        exit 1
+    fi
+else
+    echo_i "This test requires Python and the dnspython module." >&2
+    exit 1
+fi
+
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
     if $PERL -e 'use Net::DNS; die if ($Net::DNS::VERSION >= 0.69 && $Net::DNS::VERSION <= 0.70);' 2>/dev/null

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 9c6907a11b2449cd5f9f9996517b8ad0c5c5b702..fa495234efbc2d42c124a65442be8b96d310ea1c 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -919,7 +919,7 @@ if [ -x ${DELV} ] ; then
    ret=0
    echo_i "checking that validation fails when key record is missing using dns_client ($n)"
    $DELV $DELVOPTS +cd @10.53.0.4 a a.b.keyless.example > delv.out$n 2>&1 || ret=1
-   grep "resolution failed: broken trust chain" delv.out$n > /dev/null || ret=1
+   grep "resolution failed: no valid DS" delv.out$n > /dev/null || ret=1
    n=`expr $n + 1`
    if [ $ret != 0 ]; then echo_i "failed"; fi
    status=`expr $status + $ret`
@@ -4026,13 +4026,13 @@ status=`expr $status + $ret`
 
 echo_i "checking validation succeeds during transition to signed ($n)"
 ret=0
-dig_with_opts @10.53.0.4 inprogress A > dig.out.ns4.test$n || ret=1
+$DIG $DIGOPTS @10.53.0.4 inprogress A > dig.out.ns4.test$n || ret=1
 grep "flags: qr rd ra;" dig.out.ns4.test$n >/dev/null || ret=1
 grep "status: NOERROR" dig.out.ns4.test$n >/dev/null || ret=1
 grep 'A.10\.53\.0\.10' dig.out.ns4.test$n >/dev/null || ret=1
-n=$((n+1))
+n=`expr $n + 1`
 test "$ret" -eq 0 || echo_i "failed"
-status=$((status+ret))
+status=`expr $status + $ret`
 
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1