Logging: avoid claiming a host was used for an addr, when conn refused under TFO

[exim.git] / test / stderr / 2201

diff --git a/test/stderr/2201 b/test/stderr/2201
index 523ae4395b0a1feab3da50239fbb28167d30b700..c7410cd7b913691dc0f230866e8d0a9232262326 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -3,13 +3,10 @@ changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
   uid=uuuu gid=CALLER_GID pid=pppp
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID

-tls_validate_require_cipher child ppppp ended: status=0x0

 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-DSN: r0 propagating DSN
-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
+dropping to exim gid; retaining priv uid

 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME


@@ -145,7 +142,7 @@ routed by r2 router
   envelope to: unknown@test.ex
   transport: local_delivery
 search_tidyup called
   envelope to: unknown@test.ex
   transport: local_delivery
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -184,16 +181,16 @@ LOG: MAIN
   <= a@shorthost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
   <= a@shorthost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 
 ******** SERVER ********
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 
 ******** SERVER ********
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+dropping to exim gid; retaining priv uid

 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225
 ppppp daemon_smtp_port overridden by -oX:
 ppppp   <: 1225

-ppppp listening on all interfaces (IPv6) port 1225

 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN
 ppppp listening on all interfaces (IPv4) port 1225
 ppppp pid written to TESTSUITE/spool/exim-daemon.pid
 ppppp LOG: MAIN


@@ -217,7 +214,6 @@ ppppp DNS list check: rbl.test.ex/V4NET.11.12.14
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex
 ppppp cached data found but past valid time; new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 ppppp DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 ppppp => that means V4NET.11.12.14 is listed at rbl.test.ex

-PDKIM >> Hashed body data, canonicalized >>>>>>>>>>>>>>>>>>>>>>>>>>>>>

 ppppp LOG: MAIN
 ppppp   <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 ppppp Process ppppp is ready for new message
 ppppp LOG: MAIN
 ppppp   <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
 ppppp Process ppppp is ready for new message