Add testcase for callout fallback from ESMTP to SMTP.

[users/heiko/exim.git] / test / scripts / 2000-GnuTLS / 2014

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 21b703c384445e76ce72338e36b0a1c6d76bc30c..dfddfa54c1e899d40a32ed2a859b81065c6554a7 100644 (file)
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -5,7 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
 # No certificate, certificate required
 client-gnutls HOSTIPV4 PORT_D
 ??? 220
-ehlo rhu.barb
+ehlo rhu1.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -17,7 +18,8 @@ starttls
 # No certificate, certificate optional at TLS time, required by ACL
 client-gnutls 127.0.0.1 PORT_D
 ??? 220
-ehlo rhu.barb
+ehlo rhu2.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -25,7 +27,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-helo rhu.barb
+helo rhu2tls.barb
 ??? 250
 mail from:<userx@test.ex>
 ??? 250
@@ -37,7 +39,8 @@ quit
 # Good certificate, certificate required
 client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu3.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -55,7 +58,8 @@ quit
 # Good certificate, certificate optional at TLS time, checked by ACL
 client-gnutls 127.0.0.1 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu4.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -73,7 +77,8 @@ quit
 # Bad certificate, certificate required
 client-gnutls HOSTIPV4 PORT_D aux-fixed/cert1 aux-fixed/cert1
 ??? 220
-ehlo rhu.barb
+ehlo rhu5.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -85,7 +90,8 @@ starttls
 # Bad certificate, certificate optional at TLS time, reject at ACL time
 client-gnutls 127.0.0.1 PORT_D aux-fixed/cert1 aux-fixed/cert1
 ??? 220
-ehlo rhu.barb
+ehlo rhu6.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -107,7 +113,8 @@ exim -DCRL=DIR/aux-fixed/crl.pem -DSERVER=server -bd -oX PORT_D
 # Good but revoked certificate, certificate required
 client-gnutls HOSTIPV4 PORT_D aux-fixed/cert2 aux-fixed/cert2
 ??? 220
-ehlo rhu.barb
+ehlo rhu7.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-
@@ -119,7 +126,8 @@ starttls
 # Revoked certificate, certificate optional at TLS time, reject at ACL time
 client-gnutls 127.0.0.1 PORT_D aux-fixed/cert1 aux-fixed/cert1
 ??? 220
-ehlo rhu.barb
+ehlo rhu8.barb
+??? 250-
 ??? 250-
 ??? 250-
 ??? 250-