Use dsn_from for success-DSN messages. Bug 2404

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

diff --git a/test/scripts/2100-OpenSSL/2124 b/test/scripts/2100-OpenSSL/2124
index 420f6ccdf78ced32cb56581cba534e90045c4dcd..6649ed9681e9f2d5fa642bee38a7dd83dd0aa46e 100644 (file)
--- a/test/scripts/2100-OpenSSL/2124
+++ b/test/scripts/2100-OpenSSL/2124
@@ -1,16 +1,21 @@
 # TLS server: empty/non-existent certificate file
 exim -DSERVER=server -bd -oX PORT_D
 ****
 # TLS server: empty/non-existent certificate file
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client-ssl HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
+client-ssl -t2 HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+noop
+????554 Security failure
+noop
+??? 554 Security failure

 ****
 killdaemon
 exim -DSERVER=server -DCERT=/non/exist -bd -oX PORT_D
 ****
 killdaemon
 exim -DSERVER=server -DCERT=/non/exist -bd -oX PORT_D


@@ -22,6 +27,7 @@ ehlo rhu.barb
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
 ??? 250-

+??? 250-

 ??? 250
 starttls
 ??? 454
 ??? 250
 starttls
 ??? 454