X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fstdout%2F2014;h=4eddd724cf0d249e011a14c3be601c0ec626f596;hb=18d243312bf3a23bd0f464fac44797e2720e03ec;hp=cb24d0561f2d4010200c479026508fa51b785ff9;hpb=d4fd1b83a197d73cbac114fe53f3448d8b5c7cc2;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/stdout/2014 b/test/stdout/2014
index cb24d0561..4eddd724c 100644
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -21,6 +21,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Attempting to start TLS
 A TLS fatal alert has been received.
 Failed to start TLS
+>>> nop
+????554
 End of script
 ### No certificate, certificate optional at TLS time, required by ACL
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -81,6 +83,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -115,6 +120,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -150,6 +158,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 Attempting to start TLS
 A TLS fatal alert has been received.
 Failed to start TLS
+>>> nop
+????554
 End of script
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -175,6 +185,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -208,7 +221,11 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-Succeeded in starting TLS
+A TLS fatal alert has been received.
+Failed to start TLS
+>>> helo test
+??? 554
+<<< 554 Security failure
 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -234,6 +251,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -250,9 +270,9 @@ Certificate file = aux-fixed/exim-ca/example.com/server1.example.com/server1.exa
 Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
->>> ehlo rhu.barb
+>>> ehlo rhu9.barb
 ??? 250-
-<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-myhost.test.ex Hello rhu9.barb [ip4.ip4.ip4.ip4]
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
@@ -268,6 +288,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK