[master] fix "initialize with revoked key" test, add missing newline

diff --git a/bin/named/server.c b/bin/named/server.c
index a6b1c84075a33fb0db353c9d2588c5d61395ff9c..d02e60424a82c31722882353a872a73bfd0b4ec6 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -10734,6 +10734,7 @@ mkey_status(dns_view_t *view, isc_buffer_t **text) {
        }
 
        CHECK(mkey_dumpzone(view, text));
+       CHECK(putstr(text, "\n"));
 
  cleanup:
        return (result);

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index a75dc4f03bfaf361add5559b8319e3b8ba087409..14ace41f996f6839481030763a155913b31ff6e0 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -3038,7 +3038,7 @@ cp ns5/named2.conf ns5/named.conf
 $RNDC -c ../common/rndc.conf -s 10.53.0.5 -p 9953 reconfig 2>&1 | sed 's/^/I:ns5 /'
 sleep 3
 $DIG $DIGOPTS +dnssec -p 5300 @10.53.0.5 SOA . > dig.out.ns5.test$n
-grep "status: NOERROR" dig.out.ns5.test$n > /dev/null || ret=1
+grep "status: SERVFAIL" dig.out.ns5.test$n > /dev/null || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`