mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Test "tkey-gssapi-credential" conditionally

Closes #2634

See merge request isc-projects/bind9!4938
This commit is contained in:
Michał Kępień
2021-04-26 07:17:12 +00:00
parent a26e29896a a3957af864
commit c84399df64
4 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -640,7 +640,7 @@ gcc:stretch:amd64:
variables: variables:
CC: gcc CC: gcc
CFLAGS: "${CFLAGS_COMMON} -O2" CFLAGS: "${CFLAGS_COMMON} -O2"
EXTRA_CONFIGURE: "--without-cmocka" EXTRA_CONFIGURE: "--without-cmocka --without-gssapi"
<<: *debian_stretch_amd64_image <<: *debian_stretch_amd64_image
<<: *build_job <<: *build_job

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

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

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

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

19
bin/tests/system/nsupdate/setup.sh
View File

@@ -23,8 +23,23 @@ copy_setports ns5/named.conf.in ns5/named.conf
copy_setports ns6/named.conf.in ns6/named.conf copy_setports ns6/named.conf.in ns6/named.conf
copy_setports ns7/named.conf.in ns7/named.conf copy_setports ns7/named.conf.in ns7/named.conf
copy_setports ns8/named.conf.in ns8/named.conf copy_setports ns8/named.conf.in ns8/named.conf
copy_setports ns9/named.conf.in ns9/named.conf
copy_setports ns10/named.conf.in ns10/named.conf # If "tkey-gssapi-credential" is set in the configuration and GSSAPI support is
# not available, named will refuse to start. As the test system framework does
# not support starting named instances conditionally, ensure that
# "tkey-gssapi-credential" is only present in named.conf if GSSAPI support is
# available.
copy_setports ns9/named.conf.in ns9/named.conf.in.tkey
copy_setports ns10/named.conf.in ns10/named.conf.in.tkey
if $FEATURETEST --gssapi; then
sed 's|@TKEY_CONFIGURATION@|tkey-gssapi-credential "DNS/ns9.example.com@EXAMPLE.COM";|' ns9/named.conf.in.tkey > ns9/named.conf
sed 's|@TKEY_CONFIGURATION@|tkey-gssapi-credential "DNS/ns10.example.com@EXAMPLE.COM";|' ns10/named.conf.in.tkey > ns10/named.conf
else
sed 's|@TKEY_CONFIGURATION@||' ns9/named.conf.in.tkey > ns9/named.conf
sed 's|@TKEY_CONFIGURATION@||' ns10/named.conf.in.tkey > ns10/named.conf
fi
rm -f ns9/named.conf.in.tkey
rm -f ns10/named.conf.in.tkey
copy_setports verylarge.in verylarge copy_setports verylarge.in verylarge