upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 08:30:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '2634-test-tkey-gssapi-credential' into 'main'

Browse source 
Add tests for the "tkey-gssapi-credential" option

See merge request isc-projects/bind9!4905
This commit is contained in:
Petr Špaček 2021-04-22 15:25:36 +00:00
commit fa6b277b8d
8 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/tests/system/conf.sh.common
View file

@ -713,6 +713,7 @@ export KEYGEN
export KEYSETTOOL
export KEYSIGNER
export KRB5_CONFIG
export KRB5_KTNAME
export MAKEJOURNAL
export MDIG
export NAMED

2
bin/tests/system/conf.sh.in
View file

@ -71,6 +71,8 @@ PIPEQUERIES=$TOP_BUILDDIR/bin/tests/system/pipelined/pipequeries
# we don't want a KRB5_CONFIG setting breaking the tests
KRB5_CONFIG=/dev/null
# use local keytab instead of default /etc/krb5.keytab
KRB5_KTNAME=dns.keytab
#
# Construct the lists of tests to run

2
bin/tests/system/nsupdate/krb/setup.sh
View file

@ -101,7 +101,7 @@ kinit -V -k -t krb5-machine.keytab -l ${lifetime}d -c krb5-machine.ccache host/m
kinit -V -k -t ms-machine.keytab -l ${lifetime}d -c ms-machine.ccache 'machine$@EXAMPLE.COM'
cp ns7-server.keytab ../ns7/dns.keytab
cp ns8-server.keytab ../ns8/dns.keytab
cp ns8-server.keytab ../ns8/dns-other-than-KRB5_KTNAME.keytab
cp ns9-server.keytab ../ns9/dns.keytab
cp ns10-server.keytab ../ns10/dns.keytab

2
bin/tests/system/nsupdate/ns10/named.conf.in
View file

@ -20,7 +20,7 @@ options {
recursion no;
notify yes;
minimal-responses no;
tkey-gssapi-keytab "dns.keytab";
tkey-gssapi-credential "DNS/ns10.example.com@EXAMPLE.COM";
};
key rndc_key {

0
bin/tests/system/nsupdate/ns8/dns.keytab → bin/tests/system/nsupdate/ns8/dns-other-than-KRB5_KTNAME.keytab
View file

2
bin/tests/system/nsupdate/ns8/named.conf.in
View file

@ -20,7 +20,7 @@ options {
recursion no;
notify yes;
minimal-responses no;
tkey-gssapi-keytab "dns.keytab";
tkey-gssapi-keytab "dns-other-than-KRB5_KTNAME.keytab";
};
key rndc_key {

2
bin/tests/system/nsupdate/ns9/named.conf.in
View file

@ -20,7 +20,7 @@ options {
recursion no;
notify yes;
minimal-responses no;
tkey-gssapi-keytab "dns.keytab";
tkey-gssapi-credential "DNS/ns9.example.com@EXAMPLE.COM";
};
key rndc_key {

2
util/copyrights
View file

@ -654,7 +654,7 @@
./bin/tests/system/nsupdate/ns6/named.args X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns7/dns.keytab X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns7/machine.ccache X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns8/dns.keytab X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns8/dns-other-than-KRB5_KTNAME.keytab X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns8/machine.ccache X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns9/dns.keytab X 2018,2019,2020,2021
./bin/tests/system/nsupdate/ns9/machine.ccache X 2018,2019,2020,2021