X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/dc9c8f8b52cbf2e8424f5e98f63d29aa7fb81fe7..bfba2a3018912e44d89b52e6649fc11f37a42ecb:/test/stdout/2014?ds=inline

diff --git a/test/stdout/2014 b/test/stdout/2014
index cb24d0561..94b9bdee8 100644
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -8,6 +8,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -19,8 +21,10 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-A TLS fatal alert has been received.
+gnutls_record_recv: 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
@@ -32,6 +36,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -69,6 +75,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -81,6 +89,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
@@ -103,6 +114,8 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -115,6 +128,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
@@ -137,6 +153,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -148,8 +166,10 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-A TLS fatal alert has been received.
+gnutls_record_recv: 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
@@ -163,6 +183,8 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -175,6 +197,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
@@ -197,6 +222,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -204,11 +231,15 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 250-STARTTLS
 ??? 250
 <<< 250 HELP
->>> starttls
+>>> STARTTLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-Succeeded in starting TLS
+>>> NOP
+??? 554 Security failure
+<<< 554 Security failure
+>>> QUIT
+>>> 220
 End of script
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 Connecting to 127.0.0.1 port 1225 ... connected
@@ -222,6 +253,8 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 ??? 250-
 <<< 250-SIZE 52428800
 ??? 250-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -234,6 +267,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,12 +286,14 @@ 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-
+<<< 250-LIMITS MAILMAX=1000 RCPTMAX=50000
+??? 250-
 <<< 250-8BITMIME
 ??? 250-
 <<< 250-PIPELINING
@@ -268,6 +306,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