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

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

diff --git a/test/stderr/5400 b/test/stderr/5400
index 29ff83b42626157428f84a2d845de67e8d45c6f1..9fa77d5f2b844b8ca9234cd3602f78d506d1bed4 100644 (file)
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -12,6 +12,7 @@ LOG: MAIN
   rcpt for userx@domain.com
 created log directory TESTSUITE/spool/log
 accept: condition test succeeded in ACL "ar"
   rcpt for userx@domain.com
 created log directory TESTSUITE/spool/log
 accept: condition test succeeded in ACL "ar"

+end of ACL "ar": 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


@@ -24,6 +25,7 @@ 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
 ----------- start cutthrough headers send -----------
   SMTP>> DATA
   SMTP<< 354 Send data
 ----------- start cutthrough headers send -----------


@@ -57,6 +59,7 @@ check logwrite = rcpt for $local_part@$domain
 LOG: MAIN
   rcpt for userz@domain.com
 accept: condition test succeeded in ACL "ar"
 LOG: MAIN
   rcpt for userz@domain.com
 accept: condition test succeeded in ACL "ar"

+end of ACL "ar": ACCEPT

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


@@ -71,6 +74,7 @@ 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
 ----------- start cutthrough headers send -----------
   SMTP>> DATA
   SMTP<< 354 Send data
 ----------- start cutthrough headers send -----------


@@ -104,6 +108,7 @@ check logwrite = rcpt for $local_part@$domain
 LOG: MAIN
   rcpt for usery@domain.com
 accept: condition test succeeded in ACL "ar"
 LOG: MAIN
   rcpt for usery@domain.com
 accept: condition test succeeded in ACL "ar"

+end of ACL "ar": 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


@@ -122,6 +127,7 @@ check logwrite = rcpt for $local_part@$domain
 LOG: MAIN
   rcpt for userx@domain.com
 accept: condition test succeeded in ACL "ar"
 LOG: MAIN
   rcpt for userx@domain.com
 accept: condition test succeeded in ACL "ar"

+end of ACL "ar": ACCEPT

   SMTP>> QUIT
 ----------- cutthrough shutdown (more than one recipient) ------------
 LOG: MAIN
   SMTP>> QUIT
 ----------- cutthrough shutdown (more than one recipient) ------------
 LOG: MAIN


@@ -146,6 +152,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
 not using PIPELINING
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
 not using PIPELINING

+use_dsn=0

   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@domain.com>


@@ -186,6 +193,7 @@ check logwrite = rcpt for $local_part@$domain
 LOG: MAIN
   rcpt for userx@domain.com
 accept: condition test succeeded in ACL "ar"
 LOG: MAIN
   rcpt for userx@domain.com
 accept: condition test succeeded in ACL "ar"

+end of ACL "ar": 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


@@ -198,6 +206,7 @@ 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
 ----------- start cutthrough headers send -----------
   SMTP>> DATA
   SMTP<< 354 Send data
 ----------- start cutthrough headers send -----------


@@ -207,7 +216,7 @@ X-hdr-rtr: qqq
 added header line(s):
 X-hdr-rtr-new: +++
 ---
 added header line(s):
 X-hdr-rtr-new: +++
 ---

-added header line(s):
+added header line:

 X-hdr-tpt-new: new
 ---
 ----------- done cutthrough headers send ------------
 X-hdr-tpt-new: new
 ---
 ----------- done cutthrough headers send ------------