Docs: note redefined macros for expansions

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

diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index aa3e3fb19d5993d9cb0264e94fe9c663e9f1c09b..d8ae8eabf4d9dbe80909674bd2dac2a4dfe1a108 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -5,13 +5,13 @@
 # '1: Server sends good staple on request'
 #
 exim -bd -oX PORT_D -DSERVER=server \
 # '1: Server sends good staple on request'
 #
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp

 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220

-ehlo rhu.barb
+ehlo rhu1.barb

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-


@@ -20,6 +20,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -34,13 +36,13 @@ killdaemon
 # '2: Server does not staple an outdated response'
 #
 exim -bd -oX PORT_D -DSERVER=server \
 # '2: Server does not staple an outdated response'
 #
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp

 ****
 # XXX test sequence might not be quite right; this is for a server refusal
 # and we're expecting a client refusal.
 ****
 # XXX test sequence might not be quite right; this is for a server refusal
 # and we're expecting a client refusal.

-client-ssl -ocsp aux-fixed/exim-ca/expired1.example.com/CA.pem HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
+client-ssl -ocsp aux-fixed/exim-ca/example.com/CA/CA.pem HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2

 ??? 220
 ??? 220

-ehlo rhu.barb
+ehlo rhu2.barb

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-


@@ -59,13 +61,13 @@ killdaemon
 # '3: Server does not staple a response for a revoked cert'
 #
 exim -bd -oX PORT_D -DSERVER=server \
 # '3: Server does not staple a response for a revoked cert'
 #
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp

 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
 ****
 client-ssl \
  -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220

-ehlo rhu.barb
+ehlo rhu3.barb

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-


@@ -84,13 +86,13 @@ killdaemon
 # '4: Connection functions when server is prepared to staple but client does not request it'
 #
 exim -bd -oX PORT_D -DSERVER=server \
 # '4: Connection functions when server is prepared to staple but client does not request it'
 #
 exim -bd -oX PORT_D -DSERVER=server \

- -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp
+ -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp

 ****
 #
 client-ssl \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
 ****
 #
 client-ssl \
  HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220

-ehlo rhu.barb
+ehlo rhu4.barb

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-


@@ -99,7 +101,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

-ehlo rhu.barb.tls
+ehlo rhu5.barb.tls

 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-