tests-extra: fix compatibility with Bind9 9.16

diff --git a/tests-extra/tools/dnstest/server.py b/tests-extra/tools/dnstest/server.py
index e2f0c63c8f6485424254bdd70e06b647bc6e38f0..d7ef1dae6834c6e38b012527d67a3c0d751423bc 100644 (file)
--- a/tests-extra/tools/dnstest/server.py
+++ b/tests-extra/tools/dnstest/server.py
@@ -896,8 +896,6 @@ class Bind(Server):
         s.item("transfers-in", "30")
         s.item("transfers-out", "30")
         s.item("minimal-responses", "true")
-        s.item("additional-from-auth", "false")
-        s.item("additional-from-cache", "false")
         s.item("notify-delay", "0")
         s.item("notify-rate", "1000")
         s.item("max-journal-size", "unlimited")
@@ -1033,7 +1031,7 @@ class Bind(Server):
                 continue
 
             # unrelated: generate keys as Bind won't do
-            ps = [ 'dnssec-keygen', '-r', '/dev/urandom', '-n', 'ZONE', '-K', self.keydir ]
+            ps = [ 'dnssec-keygen', '-n', 'ZONE', '-a', 'RSASHA256', '-b', '1024', '-K', self.keydir ]
             if z.dnssec.nsec3:
                 ps += ['-3']
             k1 = check_output(ps + [z.name], stderr=DEVNULL)