Cutthrough: handle request when a callout-hold is active. Bug 2604

[exim.git] / test / scripts / 4200-International / 4204

diff --git a/test/scripts/4200-International/4204 b/test/scripts/4200-International/4204
index 5f00f56bae7ed2c11567e5aacf34a852ae91ee78..f8efcc33bee82bdb20485c6bbf0e1eabcbeef6ee 100644 (file)
--- a/test/scripts/4200-International/4204
+++ b/test/scripts/4200-International/4204
@@ -30,7 +30,7 @@ QUIT
 ****
 #
 killdaemon
 ****
 #
 killdaemon

-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff

 ****
 #
 #
 ****
 #
 #


@@ -41,7 +41,7 @@ exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
 ****
 #
 # Recipient verify callout, fail
 ****
 #
 # Recipient verify callout, fail

-exim -bs -odi -DCONTROL="verify=recipient/callout"
+exim -bs -odi -DCONTROL="verify=recipient/callout" -DSTRICT=0

 EHLO client.ffail
 MAIL FROM: <CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> SMTPUTF8
 RCPT TO: <userS@test.ex>
 EHLO client.ffail
 MAIL FROM: <CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> SMTPUTF8
 RCPT TO: <userS@test.ex>


@@ -49,7 +49,7 @@ QUIT
 ****
 #
 # Recipient+random verify callout, fail
 ****
 #
 # Recipient+random verify callout, fail

-exim -bs -odi -DCONTROL="verify=recipient/callout=random"
+exim -bs -odi -DCONTROL="verify=recipient/callout=random" -DSTRICT=0

 EHLO client.ffail
 MAIL FROM: <CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> SMTPUTF8
 RCPT TO: <userT@test.ex>
 EHLO client.ffail
 MAIL FROM: <CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> SMTPUTF8
 RCPT TO: <userT@test.ex>