X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/59371ea735c941334861aa5b8e1e9a06facf044f..55240832db97f7a16fd6ef2e2bb8d899897a1347:/test/scripts/2000-GnuTLS/2014

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 21b703c38..c5a01494a 100644
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -1,11 +1,13 @@
 # TLS server: mandatory, optional, and revoked certificates
 gnutls
+munge gnutls_unexpected
 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 +19,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 +28,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-helo rhu.barb
+helo rhu2tls.barb
 ??? 250
 mail from:<userx@test.ex>
 ??? 250
@@ -37,7 +40,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 +59,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 +78,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 +91,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 +114,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 +127,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-