X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/5b4569757c6dc749c250f065705f65c938bffb2e..a6ff719cc9a088d314a3f45e4b05c02868772512:/test/scripts/2000-GnuTLS/2014

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 3e6710b59..c5a01494a 100644
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -1,11 +1,12 @@
 # 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-
@@ -18,7 +19,7 @@ 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-
@@ -27,7 +28,7 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
-helo rhu.barb
+helo rhu2tls.barb
 ??? 250
 mail from:<userx@test.ex>
 ??? 250
@@ -39,7 +40,7 @@ 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-
@@ -58,7 +59,7 @@ 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-
@@ -77,7 +78,7 @@ 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-
@@ -90,7 +91,7 @@ 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-
@@ -113,7 +114,7 @@ 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-
@@ -126,7 +127,7 @@ 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-