Sync 4.next from master

[users/heiko/exim.git] / test / stderr / 5403

diff --git a/test/stderr/5403 b/test/stderr/5403
index a4104fe3cb557b9f392c7f240cc0a3f1395b9cbe..8d6f97c9aee27f0c80a2d15780f39dd1ab0c6a22 100644 (file)
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -69,15 +69,15 @@ MUNGED: ::1 will be omitted in what follows
 >>> Attempting full verification using callout
 >>> callout cache: disabled by no_cache
 >>> interface=ip4.ip4.ip4.ip4 port=1224
->>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... 127.0.0.1 >>> connected
+>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
 >>>   SMTP<< 220 server ready
 >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
 >>>   SMTP>> EHLO myhost.test.ex
 >>> cmd buf flush 21 bytes
 >>>   SMTP<< 250 OK
 >>> 127.0.0.1 in hosts_require_auth? no (option unset)
->>>   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
->>> cmd buf flush 37 bytes
+>>>   SMTP>> MAIL FROM:<sender@myhost.test.ex>
+>>> cmd buf flush 35 bytes
 >>>   SMTP<< 250 OK
 >>>   SMTP>> RCPT TO:<verify@domain.com>
 >>> cmd buf flush 29 bytes
@@ -89,6 +89,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> accept: condition test succeeded in ACL "ar"
 >>> end of ACL "ar": ACCEPT
 >>>   SMTP>> QUIT
+>>>   SMTP<< 220 OK
 >>>   SMTP(close)>>
 >>> ----------- cutthrough shutdown (host-checking mode) ------------
-LOG: 10HmaY-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com
+LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com