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

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 0d63f129e8ad34e5354c1f0cbd26342e92a99a30..3672e1c6620c061fb300210be1476b227474e1ed 100644 (file)
--- 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 960bb10c848b81adb7c7ad7edd5132b447aa54bd..42bbffdc92d5b05bc8214ffdbf41cafbb923594b 100644 (file)
--- 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 42d1db0dd8838f4cfe53f880f0317bdfc482fbeb..2fb850717f96cba1d42ab2f9aa30f4bbffdb67d5 100644 (file)
--- 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"