Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / stdout / 5700

diff --git a/test/stdout/5700 b/test/stdout/5700
index b185dca05916d0263127676a8af8b8b75bdd56a2..a8f3b7482c13a9dd894b3a5db1b76fb3ff8bb6aa 100644 (file)
--- a/test/stdout/5700
+++ b/test/stdout/5700
@@ -6,7 +6,7 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
 EHLO the.local.host.name
 250-OK
 250 HELP

-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>

 250 OK
 RCPT TO:<userx@domain1>
 250 OK
 250 OK
 RCPT TO:<userx@domain1>
 250 OK


@@ -32,7 +32,7 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
 EHLO the.local.host.name
 250-OK
 250 HELP

-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>

 250 OK
 RCPT TO:<userx@domain2>
 250 OK
 250 OK
 RCPT TO:<userx@domain2>
 250 OK


@@ -64,7 +64,20 @@ Connection request from [127.0.0.1]
 EHLO the.local.host.name
 250-OK
 250 HELP
 EHLO the.local.host.name
 250-OK
 250 HELP

-MAIL FROM:<CALLER@the.local.host.name>
+MAIL FROM:<>
+250 OK
+RCPT TO:<userx@domain1>
+450 NOT RIGHT NOW
+QUIT
+220 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO the.local.host.name
+250-OK
+250 HELP
+MAIL FROM:<>

 250 OK
 RCPT TO:<userx@domain1>
 550 GO AWAY
 250 OK
 RCPT TO:<userx@domain1>
 550 GO AWAY