Testsuite: munge for non-dkim

[exim.git] / test / stdout / 5600

diff --git a/test/stdout/5600 b/test/stdout/5600
index 550ee1c3463350d58182c0c72ccb1c9d78a0fd0f..a8bcb355cecd233fd55e031dcedee2bd2ba63b0e 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -3,12 +3,14 @@ Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu1.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu1.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -20,8 +22,8 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-Response verify OK
-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]
 >>> helo test
 ??? 250
 <<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]


@@ -40,12 +42,14 @@ Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu2.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu2.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -57,20 +61,22 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-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
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu3.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu3.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -82,20 +88,22 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-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
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 Key file = aux-fixed/cert2
 ??? 220
 <<< 220 server1.example.com ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

->>> ehlo rhu.barb
+>>> ehlo rhu4.barb

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu4.barb [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING


@@ -108,12 +116,14 @@ Key file = aux-fixed/cert2
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

->>> ehlo rhu.barb.tls
+>>> ehlo rhu5.barb.tls

 ??? 250-
 ??? 250-

-<<< 250-server1.example.com Hello rhu.barb.tls [ip4.ip4.ip4.ip4]
+<<< 250-server1.example.com Hello rhu5.barb.tls [ip4.ip4.ip4.ip4]

 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-

+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-

 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING