From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Sat, 19 Sep 2020 11:53:01 +0000 (+0000)
Subject: tests-extra: fix compatibility with Bind9 9.16
X-Git-Tag: v3.1.0~375^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6bd77f72b22eeb425cf8bbd64941b4c3989e43a;p=thirdparty%2Fknot-dns.git

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 e2f0c63c8f..d7ef1dae68 100644
--- 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)