DMARC: Avoid using Resent-From: header. Bug 3029

[exim.git] / test / stdout / 5610

diff --git a/test/stdout/5610 b/test/stdout/5610
index 9af94384a850f0dfb3fa858e024f61ad4e05a770..cfbad957208caf803b8538973829ca7b1ea006af 100644 (file)
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -9,6 +9,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -20,9 +22,11 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-Response verify OK
-SSL connection using AES256-SHA
-Succeeded in starting TLS
+OCSP status response: good signature
+Succeeded in starting TLS (with OCSP)
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
@@ -44,6 +48,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -55,9 +61,8 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-no response received
-SSL connection using AES256-SHA
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
@@ -70,6 +75,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -81,9 +88,8 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-no response received
-SSL connection using AES256-SHA
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
@@ -96,6 +102,8 @@ Key file = aux-fixed/cert2
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -107,7 +115,6 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL connection using AES256-SHA
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-
@@ -115,6 +122,8 @@ Succeeded in starting TLS
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING