summaryrefslogtreecommitdiff
path: root/test/scripts
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2012-06-04 14:54:13 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2012-06-04 14:57:04 +0100
commit9940096804c9f3985ca3bc9d862cefa0daa29c96 (patch)
tree1550f5e72b19015f4be26ff00c3d6f1419a1bd18 /test/scripts
parent389ca47a59cc0247fcee8a50da42aa00af5f7a90 (diff)
Add hosts_verify_avoid_tls option to smtp transport.
Diffstat (limited to 'test/scripts')
-rw-r--r--test/scripts/5410-cutthrough-OpenSSL/541015
-rw-r--r--test/scripts/5420-cutthrough-GnuTLS/542014
2 files changed, 26 insertions, 3 deletions
diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410
index d670abf4e..9938e00e5 100644
--- a/test/scripts/5410-cutthrough-OpenSSL/5410
+++ b/test/scripts/5410-cutthrough-OpenSSL/5410
@@ -1,6 +1,7 @@
# cutthrough_delivery to target oferring TLS
exim -DSERVER=server -bd -oX PORT_D
****
+# this one should succeed
exim -d-all+acl+transport+expand+lists -bs
EHLO myhost.test.ex
MAIL FROM:<eximtest@myhost.test.ex>
@@ -10,7 +11,19 @@ DATA
.
QUIT
****
-# via a transport setting never-tls
+# via a transport setting hosts_avoid_tls
+# so this one should not use TLS
+exim -d-all+acl+transport+expand+lists -bs
+EHLO myhost.test.ex
+MAIL FROM:<eximtest@myhost.test.ex>
+RCPT TO:<usery@domain.com>
+DATA
+
+.
+QUIT
+****
+# via a transport setting hosts_verify_avoid_tls
+# so this one should not use TLS
exim -d-all+acl+transport+expand+lists -bs
EHLO myhost.test.ex
MAIL FROM:<eximtest@myhost.test.ex>
diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420
index d670abf4e..c43e1865b 100644
--- a/test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/test/scripts/5420-cutthrough-GnuTLS/5420
@@ -1,4 +1,4 @@
-# cutthrough_delivery to target oferring TLS
+# cutthrough_delivery to target offering TLS
exim -DSERVER=server -bd -oX PORT_D
****
exim -d-all+acl+transport+expand+lists -bs
@@ -10,7 +10,17 @@ DATA
.
QUIT
****
-# via a transport setting never-tls
+# via a transport setting hosts_avoid_tls
+exim -d-all+acl+transport+expand+lists -bs
+EHLO myhost.test.ex
+MAIL FROM:<eximtest@myhost.test.ex>
+RCPT TO:<usery@domain.com>
+DATA
+
+.
+QUIT
+****
+# via a transport setting hosts_verify_avoid_tls
exim -d-all+acl+transport+expand+lists -bs
EHLO myhost.test.ex
MAIL FROM:<eximtest@myhost.test.ex>