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

[exim.git] / test / scripts / 2100-OpenSSL / 2113

diff --git a/test/scripts/2100-OpenSSL/2113 b/test/scripts/2100-OpenSSL/2113
index be1f5e4b4d3efb9b51bb2206d33190cb0e4edc08..c1341e8577d134106d900acedbee99ca3cfcbe32 100644 (file)
--- a/test/scripts/2100-OpenSSL/2113
+++ b/test/scripts/2100-OpenSSL/2113
@@ -4,11 +4,48 @@ exim -DSERVER=server -bd -oX PORT_D
 exim userx@test.ex
 Test message 1
 ****
 exim userx@test.ex
 Test message 1
 ****

-exim userx@test.ex
+exim usery@test.ex

 Test message 2
 ****
 Test message 2
 ****

-exim -qqf -d-all+acl
+exim userz@test.ex
+Test message 3
+****
+exim -d-all+acl -qqf

 ****
 killdaemon
 exim -DSERVER=server -DNOTDAEMON -qf
 ****
 ****
 killdaemon
 exim -DSERVER=server -DNOTDAEMON -qf
 ****

+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim usera@test.ex
+Test message 1
+****
+exim userb@test.ex
+Test message 2
+****
+exim userc@test.ex
+Test message 3
+****
+exim -DEQUIRE -d-all+acl -qqf
+****
+killdaemon
+exim -DSERVER=server -DNOTDAEMON -qf
+****
+#
+#
+# no tls proxy (default for test was permitting proxy)
+exim -DSERVER=server -bd -oX PORT_D
+****
+exim userx@test.ex
+Test message 1
+****
+exim usery@test.ex
+Test message 2
+****
+exim userz@test.ex
+Test message 3
+****
+exim -d-all+acl '-DPEX=*' -qqf
+****
+killdaemon