mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

fix: nil: Fix out-of-tree test

Browse Source 
A recent change to the dnssec system test depended on a file
that is only in the source tree, not in the build tree, and was
therefore not available in out-of-tree builds.

Merge branch 'each-fix-dnssec-oot' into 'main'

See merge request isc-projects/bind9!10342
This commit is contained in:
Evan Hunt 2025-03-28 04:03:42 +00:00
commit c42c6acd46
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/tests/system/dnssec/ns1/sign.sh
View File

@ -65,3 +65,9 @@ cp managed.conf ../ns4/managed.conf
# #
keyfile_to_key_id "$ksk" >managed.key.id keyfile_to_key_id "$ksk" >managed.key.id
#
# Also generate a broken trusted-keys file for the dnssec test.
#
broken=$("$KEYGEN" -q -fk -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" .)
keyfile_to_static_ds "$broken" >../ns4/broken.conf

11
bin/tests/system/dnssec/ns4/named5.conf.in
View File

@ -27,11 +27,12 @@ options {
}; };
# Note: This is deliberately wrong! The bind.keys file contains # Note: This contains a deliberately incorrect key,
# the real DNS root key, so it won't work with the local toy # so it won't work with the root zones used in the tests;
# root zones used in the tests. This is to test a forwarder # all signed data should SERVFAIL. This is to test the case
# talking to a resolver with a misconfigured trust anchor. # of a validating forwarder talking to a resolver that has
include "../../../../../bind.keys"; # a misconfigured trust anchor.
include "broken.conf";
key rndc_key { key rndc_key {
secret "1234abcd8765"; secret "1234abcd8765";

1
bin/tests/system/dnssec/tests_sh_dnssec.py
View File

@ -147,6 +147,7 @@ pytestmark = pytest.mark.extra_artifacts(
"ns3/upper.example.db", "ns3/upper.example.db",
"ns3/upper.example.db.lower", "ns3/upper.example.db.lower",
"ns3/ds-unsupported.example.db", "ns3/ds-unsupported.example.db",
"ns4/broken.conf",
"ns4/managed.conf", "ns4/managed.conf",
"ns4/managed-keys.bind", "ns4/managed-keys.bind",
"ns4/named.secroots", "ns4/named.secroots",