Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / stderr / 5400

diff --git a/test/stderr/5400 b/test/stderr/5400
index 78b56539acac6293d9c2afa18794a5f9fa7a1dbb..73934dd920a1a7aa95464d31fe10bca40344cd6c 100644 (file)
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -17,7 +17,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP<< 250 Recipient OK
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP<< 250 Recipient OK


@@ -60,7 +60,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 550 Not here, mate
   SMTP>> HELO myhost.test.ex
   SMTP<< 250 OK
   SMTP<< 550 Not here, mate
   SMTP>> HELO myhost.test.ex
   SMTP<< 250 OK

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userz@domain.com>
   SMTP<< 250 Recipient OK
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userz@domain.com>
   SMTP<< 250 Recipient OK


@@ -101,7 +101,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK

-  SMTP>> MAIL FROM:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>

   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Recipient OK
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Recipient OK


@@ -125,7 +125,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> usery@domain.com <--------
 smtp transport entered
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> usery@domain.com <--------
 smtp transport entered