git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixup testsuite cases affected by dual-tls - mainly EHLO on callouts.
[exim.git] / test / stdout / 3454
diff --git a/test/stdout/3454 b/test/stdout/3454
index 7ccebbc847cfbdec46f27d3381a9dea47d4b483f..1deec37c5e7dd0895283d928eda01d6b5bc59682 100644 (file)
--- a/test/stdout/3454
+++ b/test/stdout/3454
@@ -2,20 +2,22 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
 <<< 250-AUTH PLAIN
-??? 250-
+??? 250-STARTTLS
 <<< 250-STARTTLS
 <<< 250-STARTTLS
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> starttls
 <<< 250 HELP
 >>> starttls
-??? 220
+??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 SSL info: before/connect initialization
 <<< 220 TLS go ahead
 Attempting to start TLS
 SSL info: before/connect initialization
@@ -42,20 +44,22 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
 <<< 250-AUTH PLAIN
-??? 250-
+??? 250-STARTTLS
 <<< 250-STARTTLS
 <<< 250-STARTTLS
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> starttls
 <<< 250 HELP
 >>> starttls
-??? 220
+??? 220 TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 SSL info: before/connect initialization
 <<< 220 TLS go ahead
 Attempting to start TLS
 SSL info: before/connect initialization
@@ -75,15 +79,17 @@ SSL info: SSL negotiation finished successfully
 SSL connection using DHE-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
 SSL connection using DHE-RSA-AES256-SHA
 Succeeded in starting TLS
 >>> ehlo foobar
-??? 250-
+??? 250-myhost
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
 <<< 250-myhost.test.ex Hello foobar [127.0.0.1]
-??? 250-
+??? 250-SIZE
 <<< 250-SIZE 52428800
 <<< 250-SIZE 52428800
-??? 250-
+??? 250-8BITMIME
+<<< 250-8BITMIME
+??? 250-PIPELINING
 <<< 250-PIPELINING
 <<< 250-PIPELINING
-??? 250-
+??? 250-AUTH
 <<< 250-AUTH PLAIN
 <<< 250-AUTH PLAIN
-??? 250
+??? 250 HELP
 <<< 250 HELP
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
 <<< 250 HELP
 >>> auth plain AHVzZXJ4AHNlY3JldA==
 ??? 235
Master Exim source repository