Log local IP on delivery log line, under the incoming_interface log selector. Bug 507

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

diff --git a/test/stderr/5401 b/test/stderr/5401
index dc02c054feff9c762c1a4a157b12878d62295ee6..1b42441d963f616cb87632e752202dab096749a5 100644 (file)
--- a/test/stderr/5401
+++ b/test/stderr/5401
@@ -9,10 +9,11 @@ check control = cutthrough_delivery
 check verify = recipient
 ----------- end verify ------------
 accept: condition test succeeded in ACL "acl_rcpt"
 check verify = recipient
 ----------- end verify ------------
 accept: condition test succeeded in ACL "acl_rcpt"

+end of ACL "acl_rcpt": ACCEPT

 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP
 ----------- start cutthrough setup ------------
 Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP<< 220 ESMTP

-  SMTP>> HELO myhost.test.ex
+  SMTP>> EHLO myhost.test.ex

   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP<< 250 OK
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK


@@ -21,14 +22,18 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL
 ----------- end cutthrough setup ------------
 processing "accept"
 accept: condition test succeeded in inline ACL

+end of inline ACL: ACCEPT

   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> DATA
   SMTP<< 354 Send data

+----------- start cutthrough headers send -----------
+----------- done cutthrough headers send ------------

   SMTP>> .
   SMTP<< 250 OK
   SMTP>> .
   SMTP<< 250 OK

------------ cutthrough close ------------

 LOG: MAIN
 LOG: MAIN

-  >> userx@domain.com R=all T=smtp
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"

 created log directory TESTSUITE/spool/log
 created log directory TESTSUITE/spool/log

+  SMTP>> QUIT
+----------- cutthrough shutdown (delivered) ------------

 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
 LOG: MAIN
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
 LOG: MAIN