Testsuite: more connect-time munge tweaking

[exim.git] / test / log / 0624

diff --git a/test/log/0624 b/test/log/0624
index bbfa98dfe507efb7581800c19a5e2eca959da778..f5f7f536bb552b97046f084a615ad59965e448cf 100644 (file)
--- a/test/log/0624
+++ b/test/log/0624
@@ -1,19 +1,23 @@
-1999-03-02 09:44:33 U=CALLER F=<testclient@primaryhostname.ex> rejected RCPT <a@notmatched.ex>
-1999-03-02 09:44:33 domain plainstring.ex
-1999-03-02 09:44:33 value  plainstring.ex
-1999-03-02 09:44:33 $0 'plainstring.ex'  $1 ''
-1999-03-02 09:44:33 domain headtail.ex
-1999-03-02 09:44:33 value  *tail.ex
-1999-03-02 09:44:33 $0 'headtail.ex'  $1 'head'
-1999-03-02 09:44:33 domain headregextail.ex
-1999-03-02 09:44:33 value  ^.*r(e.)ex
-1999-03-02 09:44:33 $0 'headregextail.ex'  $1 'eg'
-1999-03-02 09:44:33 domain primaryhostname.ex
-1999-03-02 09:44:33 value  primaryhostname.ex
-1999-03-02 09:44:33 $0 'primaryhostname.ex'  $1 ''
-1999-03-02 09:44:33 domain [127.0.0.1]
-1999-03-02 09:44:33 value  @[]
-1999-03-02 09:44:33 $0 '[127.0.0.1]'  $1 ''
-1999-03-02 09:44:33 domain mx46.test.ex
-1999-03-02 09:44:33 value  @mx_any/ignore=1.1.1.1
-1999-03-02 09:44:33 $0 '46.test.ex'  $1 ''
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss for a@test.ex b@test.ex c@test.ex
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => a@test.ex R=r T=smtp H=127.0.0.1 [127.0.0.1]:PORT_D C="250 OK id=10HmaY-000000005vi-0000"
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => b@test.ex R=r T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D C="250 OK id=10HmaZ-000000005vi-0000"
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => c@test.ex R=r T=smtp H=127.0.0.1 [127.0.0.1]:PORT_D2 C="250 OK id=10HmbA-000000005vi-0000"
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed
+
+******** SERVER ********
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D port PORT_D2
+2017-07-30 18:51:05.712 localhost
+2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F=<CALLER@test.ex> RCPT <a@test.ex>: discarded by RCPT ACL
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@the.local.host.name
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 => blackhole (RCPT ACL discarded recipients)
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 Completed
+2017-07-30 18:51:05.712 the.local.host.name
+2017-07-30 18:51:05.712 H=the.local.host.name [ip4.ip4.ip4.ip4] F=<CALLER@test.ex> RCPT <b@test.ex>: discarded by RCPT ACL
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 <= CALLER@test.ex H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmaX-000000005vi-0000@the.local.host.name
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 => blackhole (RCPT ACL discarded recipients)
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed
+2017-07-30 18:51:05.712 localhost
+2017-07-30 18:51:05.712 H=localhost (the.local.host.name) [127.0.0.1] F=<CALLER@test.ex> RCPT <c@test.ex>: discarded by RCPT ACL
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@the.local.host.name
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 => blackhole (RCPT ACL discarded recipients)
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 Completed