debug_print_socket(): output formatting

[users/heiko/exim.git] / test / stdout / 2014

diff --git a/test/stdout/2014 b/test/stdout/2014
index cb24d0561f2d4010200c479026508fa51b785ff9..829a86c427518b75d430ac724a18532d17fc8ad7 100644 (file)
--- 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
 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
 End of script
 ### No certificate, certificate optional at TLS time, required by ACL
 Connecting to 127.0.0.1 port 1225 ... connected


@@ -150,6 +152,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
 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
 End of script
 ### Bad certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected


@@ -208,7 +212,11 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-Succeeded in starting TLS
+A TLS fatal alert has been received.
+Failed to start TLS
+>>> mail from:<userx@test.ex>
+??? 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
 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected


@@ -250,9 +258,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
 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-

-<<< 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-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-