From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 9 Oct 2017 21:20:35 +0000 (+0200)
Subject: Move KRB5_CONFIG=/dev/null to conf.sh.* so it gets applied to named and not only... 
X-Git-Tag: v9.12.0b1~30^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74f46c45b0868219512f52bb54d105ed65212f71;p=thirdparty%2Fbind9.git

Move KRB5_CONFIG=/dev/null to conf.sh.* so it gets applied to named and not only the tsiggss test
---

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 0d63f129e8a..3672e1c6620 100644
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -65,6 +65,9 @@ MAKEJOURNAL=$TOP/bin/tests/makejournal
 PIPEQUERIES=$TOP/bin/tests/system/pipelined/pipequeries
 SAMPLEUPDATE=$TOP/lib/samples/sample-update
 
+# we don't want a KRB5_CONFIG setting breaking the tests
+KRB5_CONFIG=/dev/null
+
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
@@ -150,6 +153,7 @@ export KEYFRLAB
 export KEYGEN
 export KEYSETTOOL
 export KEYSIGNER
+export KRB5_CONFIG
 export MAKEJOURNAL
 export MDIG
 export NAMED
diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index 960bb10c848..42bbffdc92d 100644
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -71,6 +71,9 @@ MAKEJOURNAL=$TOP/Build/$VSCONF/makejournal@EXEEXT@
 PIPEQUERIES=$TOP/Build/$VSCONF/pipequeries@EXEEXT@
 # to port SAMPLEUPDATE=$TOP/lib/samples/sample-update
 
+# we don't want a KRB5_CONFIG setting breaking the tests
+KRB5_CONFIG=/dev/null
+
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
@@ -154,6 +157,7 @@ export KEYFRLAB
 export KEYGEN
 export KEYSETTOOL
 export KEYSIGNER
+export KRB5_CONFIG
 export MAKEJOURNAL
 export MDIG
 export NAMED
diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh
index 42d1db0dd88..2fb850717f9 100644
--- a/bin/tests/system/tsiggss/tests.sh
+++ b/bin/tests/system/tsiggss/tests.sh
@@ -15,10 +15,6 @@ status=0
 
 DIGOPTS="@10.53.0.1 -p 5300"
 
-# we don't want a KRB5_CONFIG setting breaking the tests
-KRB5_CONFIG=/dev/null
-export KRB5_CONFIG
-
 test_update() {
     host="$1"
     type="$2"