Merge branch 'exim-4.96+security' into master+security

[exim.git] / test / scripts / 5600-OCSP-OpenSSL / 5611

diff --git a/test/scripts/5600-OCSP-OpenSSL/5611 b/test/scripts/5600-OCSP-OpenSSL/5611
index cb8f44fe133ff602500a230805dad09b2e1c8cac..3d18a742d2259ef41447bf2683cdffa0c24264a6 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5611
+++ b/test/scripts/5600-OCSP-OpenSSL/5611
@@ -2,7 +2,7 @@
 #
 #
 # Client works when we request but don't require OCSP stapling and none comes
-exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""
 ****
 exim norequire@test.ex
 test message.
@@ -26,7 +26,7 @@ millisleep 500
 #
 #
 # Client accepts good stapled info
-exim CALLER@test.ex
+exim good_staple@test.ex
 test message.
 ****
 sleep 1
@@ -35,14 +35,14 @@ killdaemon
 #
 #
 # Client fails on lack of required stapled info
-exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null
+exim -bd -oX PORT_D -DSERVER=server -DRETURN=""
 ****
-exim CALLER@test.ex
+exim lack_required@test.ex
 test message.
 ****
 sleep 1
 killdaemon
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
 #
 #
 #
@@ -50,13 +50,13 @@ sudo rm spool/db/retry
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
  -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.revoked.resp
 ****
-exim CALLER@test.ex
+exim revoved@test.ex
 test message.
 ****
 sleep 1
 killdaemon
 millisleep 200
-sudo rm spool/db/retry
+sudo rm spool/db/retry*
 #
 #
 #
@@ -65,7 +65,7 @@ sudo rm spool/db/retry
 EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \
  -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.signernocert.dated.resp
 ****
-exim CALLER@test.ex
+exim expired@test.ex
 test message.
 ****
 sleep 1